Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[greatlrd] 14854: David Nordenberg: Swedish translation

by greatlrd＠svn.reactos.com

David Nordenberg: Swedish translation Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc --- trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-04-28 22:39:50 UTC (rev 14853) +++ trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-04-28 23:11:04 UTC (rev 14854) @@ -375,7 +375,65 @@ //////////////////////////////////////////////////////////////////////// ///// +/////////////////////////////////////////////////////////////////////// ////// +// Swedish (SE) resources +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SWE) +#ifdef _WIN32 +LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Íppna", ID_FILE_OPEN + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Visa" + BEGIN + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR + MENUITEM "S&idfõlt", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "&Fullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "Om &IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "Om &operativsystemet...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS webblõsare" + IDS_EMPTY "(Tom)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&Om..." +END + +#endif // Swedish (SE) resources +/////////////////////////////////////////////////////////////////////// ////// + + #ifndef APSTUDIO_INVOKED //////////////////////////////////////////////////////////////////////// ///// //

19 years, 8 months

[ion] 14853: Remove rant. H&E are very competent developers and made a typical bug that anyone could've made. I was just pissed for having lost an hour finding it ; )

by ion＠svn.reactos.com

Remove rant. H&E are very competent developers and made a typical bug that anyone could've made. I was just pissed for having lost an hour finding it ;) Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-04-28 22:05:26 UTC (rev 14852) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-04-28 22:39:50 UTC (rev 14853) @@ -2147,11 +2147,6 @@ ((PUCHAR)AdapterBusInfo + sizeof(SCSI_ADAPTER_BUS_INFO) + (sizeof(SCSI_BUS_DATA) * (AdapterBusInfo->NumberOfBuses - 1))); - /* - * RANT: - * Whoever originally coded this to depend on the IRP's System Buffer to be - * magically cleared for him should never be allowed to code drivers again. - */ RtlZeroMemory(UnitInfo, sizeof(*UnitInfo)); for (Bus = 0; Bus < AdapterBusInfo->NumberOfBuses; Bus++)

19 years, 8 months

[greatlrd] 14852: Remove all hardcode string to En.rc

by greatlrd＠svn.reactos.com

Remove all hardcode string to En.rc from memmory.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 21:56:36 UTC (rev 14851) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 22:05:26 UTC (rev 14852) @@ -278,6 +278,17 @@ STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" +STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" + +STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n \ + %13s bytes total physical RAM.\n \ + %13s bytes available physical RAM.\n\n \ + %13s bytes total page file.\n \ + %13s bytes available page file.\n\n \ + %13s bytes total virtual memory.\n \ + %13s bytes available virtual memory.\n" + + STRING_RMDIR_HELP, "Removes a directory.\n\n \ RMDIR [drive:]path\nRD [drive:]path" _____ Modified: trunk/reactos/subsys/system/cmd/memory.c --- trunk/reactos/subsys/system/cmd/memory.c 2005-04-28 21:56:36 UTC (rev 14851) +++ trunk/reactos/subsys/system/cmd/memory.c 2005-04-28 22:05:26 UTC (rev 14852) @@ -6,9 +6,13 @@ * * 01-Sep-1999 (Eric Kohl) * Started. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_MEMORY @@ -60,12 +64,12 @@ TCHAR szAvailPageFile[20]; TCHAR szTotalVirtual[20]; TCHAR szAvailVirtual[20]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays the amount of system memory.\n" - "\n" - "MEMORY")); + LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -81,17 +85,8 @@ ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE); ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE); - ConOutPrintf (_T("\n" - " %12s%% memory load.\n" - "\n" - " %13s bytes total physical RAM.\n" - " %13s bytes available physical RAM.\n" - "\n" - " %13s bytes total page file.\n" - " %13s bytes available page file.\n" - "\n" - " %13s bytes total virtual memory.\n" - " %13s bytes available virtual memory.\n"), + LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, szAvailPageFile, szTotalVirtual, szAvailVirtual); _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 21:56:36 UTC (rev 14851) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 22:05:26 UTC (rev 14852) @@ -132,12 +132,15 @@ #define STRING_MKDIR_HELP 657 -#define STRING_RMDIR_HELP 658 +#define STRING_MEMMORY_HELP1 658 +#define STRING_MEMMORY_HELP2 659 -#define STRING_REM_HELP 659 +#define STRING_RMDIR_HELP 660 +#define STRING_REM_HELP 661 +

19 years, 8 months

[hpoussin] 14851: Don't pass a NULL pointer as offset when creating a IRP_MJ_READ irp.

by hpoussin＠svn.reactos.com

Don't pass a NULL pointer as offset when creating a IRP_MJ_READ irp. Modified: trunk/reactos/drivers/bus/serenum/detect.c _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-04-28 21:17:07 UTC (rev 14850) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-04-28 21:56:36 UTC (rev 14851) @@ -71,14 +71,16 @@ PIRP Irp; IO_STATUS_BLOCK ioStatus; KEVENT event; + LARGE_INTEGER zero; NTSTATUS Status; KeInitializeEvent(&event, NotificationEvent, FALSE); + zero.QuadPart = 0; Irp = IoBuildSynchronousFsdRequest( IRP_MJ_READ, LowerDevice, Buffer, BufferSize, - 0, + &zero, &event, &ioStatus); if (!Irp) @@ -422,6 +424,10 @@ UNICODE_STRING CompatibleIds; NTSTATUS Status; + DPRINT("Serenum: SerenumDetectLegacyDevice(DeviceObject %p, LowerDevice %p)\n", + DeviceObject, + LowerDevice); + RtlZeroMemory(Buffer, sizeof(Buffer)); /* Reset UART */

19 years, 8 months

[greatlrd] 14850: Remove all hardcode string to En.rc

by greatlrd＠svn.reactos.com

Remove all hardcode string to En.rc from free.c, goto.c, if.c label.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 21:17:07 UTC (rev 14850) @@ -239,7 +239,42 @@ To user the FOR comamnd in a batch program, specify %%variable instead of\n \ %variable." +STRING_FREE_HELP1, "\n Volume in drive %s is %-11s Serial number is %s\n \ + %16s bytes total disk space\n \ + %16s bytes used\n \ + %16s bytes free\n" +STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]" + +STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n \ + IF [NOT] ERRORLEVEL number command\n \ + IF [NOT] string1==string2 command\n \ + IF [NOT] EXIST filename command\n \ + IF [NOT] DEFINED variable command\n\n \ +NOT Specifies that CMD should carry out the command only if\n \ + the condition is false\n \ +ERRORLEVEL number Specifies a true condition if the last program run returned\n \ + an exit code equal or greater than the number specified.\n \ +command Specifies the command to carry out if the condition is met.\n \ +string1==string2 Specifies a true condition if the specified text strings\n \ + match.\n \ +EXIST filename Specifies a true condition if the specified filename exists.\n \ +DEFINED variable Specifies a true condition if the specified variable is\n \ + defined." + +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n \ +GOTO label\n\n \ + label Specifies a text string used in a batch script as a label.\n\n \ +You type a label on a line by itself, beginning with a colon." + +STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]" + +STRING_LABEL_HELP2, "Volume in drive %c: is %s\n" +STRING_LABEL_HELP3, "Volume in drive %c: has no label\n" +STRING_LABEL_HELP4, "Volume Serial Number is %04X-%04X\n" +STRING_LABEL_HELP5, "Drive label (11 Characters, ENTER if none)? " + + STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" @@ -293,16 +328,17 @@ STRING_DEL_ERROR8, "No Wildcards!\n" STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2, "Syntax error" -STRING_FOR_ERROR1, "'in' missing in for statement." -STRING_FOR_ERROR2, "no brackets found." -STRING_FOR_ERROR3, "'do' missing." -STRING_FOR_ERROR4, "no command after 'do'." -STRING_FREE_ERROR1, "Invalid drive" -STRING_FREE_ERROR2, "unlabeled" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR4, "no command after 'do'." +STRING_FREE_ERROR1, "Invalid drive" +STRING_FREE_ERROR2, "unlabeled" +STRING_GOTO_ERROR1, "No label specified for GOTO" +STRING_GOTO_ERROR2, "Label '%s' not found\n" STRING_PARAM_ERROR, "Required parameter missing\n" - STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n" _____ Modified: trunk/reactos/subsys/system/cmd/free.c --- trunk/reactos/subsys/system/cmd/free.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/free.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -6,9 +6,13 @@ * * 01-Sep-1999 (Eric Kohl) * Started. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_FREE @@ -67,10 +71,14 @@ DWORD dwBytPerSec; DWORD dwFreeCl; DWORD dwTotCl; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':')) { - ConErrPrintf (_T("Invalid drive %s\n"), szDisk); + + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ((LPTSTR)szMsg); + return; } @@ -80,12 +88,17 @@ if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial, NULL, NULL, NULL, 0)) { - ConErrPrintf (_T("Invalid drive %s:\n"), szDrive); + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T("%s %s:\n"),(LPTSTR)szMsg, szDrive); return; } if (szVolume[0] == _T('\0')) - _tcscpy (szVolume, _T("unlabeled")); + { + + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); + _tcscpy (szVolume, (LPTSTR) szMsg); + } _stprintf (szSerial, _T("%04X-%04X"), @@ -95,7 +108,8 @@ if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl, &dwBytPerSec, &dwFreeCl, &dwTotCl)) { - ConErrPrintf (_T("Invalid drive %s:\n"), szDrive); + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T("%s %s:\n"),(LPTSTR)szMsg, szDrive); return; } @@ -108,13 +122,9 @@ uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwFreeCl; ConvertULargeInteger (uliSize, szFree, 40); - ConOutPrintf (_T("\n" - " Volume in drive %s is %-11s Serial number is %s\n" - " %16s bytes total disk space\n" - " %16s bytes used\n" - " %16s bytes free\n"), - szDrive, szVolume, szSerial, - szTotal, szUsed, szFree); + + LoadString( GetModuleHandle(NULL), STRING_FREE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg,szDrive, szVolume, szSerial,szTotal, szUsed, szFree); } @@ -124,12 +134,13 @@ TCHAR szDefPath[MAX_PATH]; INT argc, i; LPTSTR *arg; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays drive information.\n" - "\n" - "FREE [drive: ...]")); + LoadString( GetModuleHandle(NULL), STRING_FREE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -21,9 +21,13 @@ * * 27-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Added help text ("/?"). + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" /* @@ -37,6 +41,7 @@ { LPTSTR tmp; LONG lNewPosHigh; + WCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_goto (\'%s\', \'%s\'\n"), cmd, param); @@ -44,13 +49,9 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Directs CMD to a labeled line in a batch script.\n" - "\n" - "GOTO label\n" - "\n" - " label Specifies a text string used in a batch script as a label.\n" - "\n" - "You type a label on a line by itself, beginning with a colon.")); + LoadString( GetModuleHandle(NULL), STRING_GOTO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } @@ -62,7 +63,9 @@ if (*param == _T('\0')) { - ExitBatch (_T("No label specified for GOTO\n")); + + LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ExitBatch ((LPTSTR)szMsg); return 1; } @@ -94,7 +97,8 @@ return 0; } - ConErrPrintf (_T("Label '%s' not found\n"), param); + LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ((LPTSTR)szMsg,param); ExitBatch (NULL); return 1; _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/if.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -24,9 +24,14 @@ * * 17-Feb-2001 (ea) * IF DEFINED variable command + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc + * */ #include "precomp.h" +#include "resource.h" #define X_EXEC 1 @@ -36,6 +41,7 @@ { INT x_flag = 0; /* when set cause 'then' clause to be executed */ LPTSTR pp; + WCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_if: (\'%S\', \'%S\')\n"), cmd, param); @@ -43,23 +49,8 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Performs conditional processing in batch programs.\n" - "\n" - " IF [NOT] ERRORLEVEL number command\n" - " IF [NOT] string1==string2 command\n" - " IF [NOT] EXIST filename command\n" - " IF [NOT] DEFINED variable command\n" - "\n" - "NOT Specifies that CMD should carry out the command only if\n" - " the condition is false\n" - "ERRORLEVEL number Specifies a true condition if the last program run returned\n" - " an exit code equal or greater than the number specified.\n" - "command Specifies the command to carry out if the condition is met.\n" - "string1==string2 Specifies a true condition if the specified text strings\n" - " match.\n" - "EXIST filename Specifies a true condition if the specified filename exists.\n" - "DEFINED variable Specifies a true condition if the specified variable is\n" - " defined.")); + LoadString( GetModuleHandle(NULL), STRING_IF_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/label.c --- trunk/reactos/subsys/system/cmd/label.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/label.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -12,9 +12,13 @@ * * 19-Jan-1998 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Unicode ready! + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_LABEL @@ -27,6 +31,7 @@ DWORD dwSerialNr; LPTSTR *arg; INT args; + WCHAR szMsg[RC_STRING_MAX_SIZE]; /* set empty label string */ szLabel[0] = _T('\0'); @@ -34,8 +39,9 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays or changes drive label.\n\n" - "LABEL [drive:][label]")); + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg); + return 0; } @@ -85,21 +91,29 @@ GetVolumeInformation (szRootPath, szOldLabel, 80, &dwSerialNr, NULL, NULL, NULL, 0); - /* print drive info */ - ConOutPrintf (_T("Volume in drive %c:"), _totupper (szRootPath[0])); - + /* print drive info */ if (szOldLabel[0] != _T('\0')) - ConOutPrintf (_T(" is %s\n"), szOldLabel); + { + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR) szMsg, _totupper (szRootPath[0]), szOldLabel); + } else - ConOutPrintf (_T(" has no label\n")); + { + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR) szMsg, _totupper (szRootPath[0])); + } + + /* print the volume serial number */ - ConOutPrintf (_T("Volume Serial Number is %04X-%04X\n"), - HIWORD(dwSerialNr), LOWORD(dwSerialNr)); + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); if (szLabel[0] == _T('\0')) { - ConOutPrintf (_T("Drive label (11 Characters, ENTER if none)? ")); + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg); + ConInString (szLabel, 80); } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 21:17:07 UTC (rev 14850) @@ -59,7 +59,9 @@ #define STRING_FOR_ERROR4 337 #define STRING_FREE_ERROR1 338 #define STRING_FREE_ERROR2 339 -#define STRING_PARAM_ERROR 340 +#define STRING_GOTO_ERROR1 340 +#define STRING_GOTO_ERROR2 341 +#define STRING_PARAM_ERROR 342 #define STRING_ATTRIB_HELP 600 @@ -115,12 +117,27 @@ #define STRING_FOR_HELP1 646 -#define STRING_MKDIR_HELP 647 -#define STRING_RMDIR_HELP 648 -#define STRING_REM_HELP 649 +#define STRING_FREE_HELP1 647 +#define STRING_FREE_HELP2 648 +#define STRING_IF_HELP1 650 +#define STRING_GOTO_HELP1 651 +#define STRING_LABEL_HELP1 652 +#define STRING_LABEL_HELP2 653 +#define STRING_LABEL_HELP3 654 +#define STRING_LABEL_HELP4 655 +#define STRING_LABEL_HELP5 656 + +#define STRING_MKDIR_HELP 657 + +#define STRING_RMDIR_HELP 658 + +#define STRING_REM_HELP 659 + + +

19 years, 8 months

[fireball] 14849: Fix (registry.c:325, dated 20050425) test failure. Description: Added RegOpenKeyA/W check for input param (if it's NULL pointer, returning error)

by fireball＠svn.reactos.com

Fix (registry.c:325, dated 20050425) test failure. Description: Added RegOpenKeyA/W check for input param (if it's NULL pointer, returning error) Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-04-28 20:00:37 UTC (rev 14848) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-04-28 20:26:06 UTC (rev 14849) @@ -1731,6 +1731,10 @@ NTSTATUS Status; DPRINT("RegOpenKeyA hKey 0x%x lpSubKey %s phkResult %p\n", hKey, lpSubKey, phkResult); + + // Check input params + if (phkResult == NULL) return ERROR_INVALID_PARAMETER; + Status = MapDefaultKey (&KeyHandle, hKey); if (!NT_SUCCESS(Status)) @@ -1782,6 +1786,10 @@ NTSTATUS Status; DPRINT("RegOpenKeyW hKey 0x%x lpSubKey %S phkResult %p\n", hKey, lpSubKey, phkResult); + + // Check input params + if (phkResult == NULL) return ERROR_INVALID_PARAMETER; + Status = MapDefaultKey (&KeyHandle, hKey); if (!NT_SUCCESS(Status))

19 years, 8 months

[greatlrd] 14848: change _T((LPTSTR)szMsg)) to (LPTSTR)szMsg)

by greatlrd＠svn.reactos.com

change _T((LPTSTR)szMsg)) to (LPTSTR)szMsg) thanks royce3 he did see my small mistage Remove all hardcode string to En.rc from for.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 20:00:37 UTC (rev 14848) @@ -228,9 +228,18 @@ STRING_ECHO_HELP5, "ECHO is %s\n" - STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" +STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n \ +FOR %variable IN (set) DO command [parameters]\n\n \ + %variable Specifies a replaceable parameter.\n \ + (set) Specifies a set of one or more files. Wildcards may be used.\n \ + command Specifies the command to carry out for each file.\n \ + parameters Specifies parameters or switches for the specified command.\n\n \ +To user the FOR comamnd in a batch program, specify %%variable instead of\n \ +%variable." + + STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" @@ -240,6 +249,7 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" + @@ -283,6 +293,12 @@ STRING_DEL_ERROR8, "No Wildcards!\n" STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2, "Syntax error" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR4, "no command after 'do'." +STRING_FREE_ERROR1, "Invalid drive" +STRING_FREE_ERROR2, "unlabeled" STRING_PARAM_ERROR, "Required parameter missing\n" _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -282,7 +282,7 @@ if ((int)(_tcslen (cmd) - len + m - n) > maxlen) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); /* the parser won't cause any problems with an empty line */ cmd[0] = _T('\0'); } @@ -311,7 +311,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -207,7 +207,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -233,7 +233,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -37,7 +37,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/call.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -53,7 +53,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -28,7 +28,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -39,7 +39,7 @@ { /* display active code page number */ LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), GetConsoleCP ()); + ConErrPrintf ((LPTSTR)szMsg, GetConsoleCP ()); return 0; } @@ -48,7 +48,7 @@ { /* too many parameters */ LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), param); + ConErrPrintf ((LPTSTR)szMsg, param); return 1; } @@ -62,7 +62,7 @@ if (uNewCodePage == 0) { LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), arg[0]); + ConErrPrintf ((LPTSTR)szMsg, arg[0]); freep (arg); return 1; } @@ -70,7 +70,7 @@ if (!SetConsoleCP (uNewCodePage)) { LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } else { _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -129,7 +129,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -172,7 +172,7 @@ { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); freep (arg); return 1; } @@ -203,7 +203,7 @@ if (*s != _T(',')) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); freep (arg); return 1; } @@ -215,7 +215,7 @@ else if (arg[i][0] == _T('/')) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), arg[i]); + ConErrPrintf ((LPTSTR)szMsg, arg[i]); freep (arg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -41,7 +41,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -635,14 +635,14 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), in); + ConErrPrintf ((LPTSTR)szMsg, in); return; } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), in); + ConErrPrintf ((LPTSTR)szMsg, in); return; } #ifdef _DEBUG @@ -668,7 +668,7 @@ if (hFile[1] == INVALID_HANDLE_VALUE){ LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return; } @@ -721,7 +721,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), out); + ConErrPrintf ((LPTSTR)szMsg, out); return; } @@ -729,7 +729,7 @@ if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), out); + ConErrPrintf ((LPTSTR)szMsg, out); return; } @@ -783,7 +783,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), err); + ConErrPrintf ((LPTSTR)szMsg, err); return; } @@ -791,7 +791,7 @@ if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), err); + ConErrPrintf ((LPTSTR)szMsg, err); return; } @@ -1080,32 +1080,32 @@ /* print command list */ LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg)); + ConOutPrintf ((LPTSTR)szMsg); PrintCommandList (); /* print feature list */ LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #ifdef FEATURE_ALIASES LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_HISTORY LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_UNIX_FILENAME_COMPLETION LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_DIRECTORY_STACK LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_REDIRECTION LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif ConOutChar (_T('\n')); } @@ -1155,7 +1155,7 @@ if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); ExitProcess (0); } SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); @@ -1260,7 +1260,7 @@ if (IsExistingFile (_T("commandline"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), commandline); + ConErrPrintf ((LPTSTR)szMsg, commandline); ParseCommandLine (commandline); } } @@ -1297,14 +1297,14 @@ if (IsExistingFile (_T("cmdexit.bat"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); ParseCommandLine (_T("cmdexit.bat")); } else if (IsExistingFile (_T("\\cmdexit.bat"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); ParseCommandLine (_T("\\cmdexit.bat")); } #ifndef __REACTOS__ @@ -1321,7 +1321,7 @@ if (IsExistingFile (_T("commandline"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), commandline); + ConErrPrintf ((LPTSTR)szMsg, commandline); ParseCommandLine (commandline); } } _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/color.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -31,7 +31,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); } @@ -46,7 +46,7 @@ if ((wColor & 0xF) == (wColor &0xF0) >> 4) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); } else { @@ -93,17 +93,17 @@ if (StringToColor (&wColor, &rest) == FALSE) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); return 1; } LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), wColor); + ConErrPrintf ((LPTSTR)szMsg, wColor); if ((wColor & 0xF) == (wColor &0xF0) >> 4) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), wColor); + ConErrPrintf ((LPTSTR)szMsg, wColor); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/console.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -234,7 +234,7 @@ else { LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } } _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -307,7 +307,7 @@ lpOptions = _T(Options); LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg)); + ConOutPrintf ((LPTSTR)szMsg); ConInString (inp, 10); ConOutPuts (_T("")); @@ -352,7 +352,7 @@ if (hFileSrc == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), source); + ConErrPrintf ((LPTSTR)szMsg, source); return 0; } @@ -380,7 +380,7 @@ if (!_tcscmp (dest, source)) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), source); + ConErrPrintf ((LPTSTR)szMsg, source); CloseHandle (hFileSrc); return 0; @@ -457,7 +457,7 @@ { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); free (buffer); CloseHandle (hFileDest); @@ -656,7 +656,7 @@ if (!_tcsncmp (rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 1; } @@ -729,7 +729,7 @@ else if (bDestFound && bWildcards) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); DeleteFileList (sources); freep (p); _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/date.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -54,17 +54,17 @@ case 0: /* mmddyy */ default: LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break; case 1: /* ddmmyy */ LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break; case 2: /* yymmdd */ LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break; } } @@ -194,7 +194,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -248,7 +248,7 @@ return 0; } LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); } _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/del.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -122,7 +122,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), + ConOutPrintf ((LPTSTR)szMsg, lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], @@ -232,7 +232,7 @@ /* wildcards in filespec */ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif GetFullPathName (arg[i], @@ -242,10 +242,10 @@ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), pFilePart); + ConErrPrintf ((LPTSTR)szMsg, pFilePart); #endif @@ -269,17 +269,17 @@ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif /* ask for deleting */ if (dwFlags & DEL_PROMPT) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN (_T((LPTSTR)szMsg)); + res = FilePromptYN ((LPTSTR)szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -290,7 +290,7 @@ if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); } /* delete the file */ @@ -335,7 +335,7 @@ /* no wildcards in filespec */ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif GetFullPathName (arg[i], MAX_PATH, @@ -346,10 +346,10 @@ if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) //Don't ask if the file doesn't exist, the following code will make the error-msg { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN (_T((LPTSTR)szMsg)); + res = FilePromptYN ((LPTSTR)szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -359,12 +359,12 @@ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); #endif if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); } if (!(dwFlags & DEL_NOTHING)) @@ -424,7 +424,7 @@ LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); } - ConOutPrintf (_T((LPTSTR)szMsg), dwFiles); + ConOutPrintf ((LPTSTR)szMsg, dwFiles); } return 0; _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -24,7 +24,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -212,7 +212,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); } @@ -829,12 +829,12 @@ if (szVolName[0] != _T('\0')) { LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0], szVolName); + ConOutPrintf ((LPTSTR)szMsg, szRootName[0], szVolName); } else { LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0]); + ConOutPrintf ((LPTSTR)szMsg, szRootName[0]); } @@ -843,7 +843,7 @@ /* print the volume serial number if the return was successful */ LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), + ConOutPrintf ((LPTSTR)szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); @@ -1075,7 +1075,7 @@ ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),ulFiles, szBuffer); + ConOutPrintf ((LPTSTR)szMsg,ulFiles, szBuffer); } /* Print total directories and freespace */ @@ -1083,7 +1083,7 @@ GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),ulDirs, szBuffer); + ConOutPrintf ((LPTSTR)szMsg,ulDirs, szBuffer); return 0; } @@ -1729,7 +1729,7 @@ { ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),dwCountFiles, szBytes); + ConOutPrintf ((LPTSTR)szMsg,dwCountFiles, szBytes); } /* Add statistics to recursive statistics*/ _____ Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -145,7 +145,7 @@ if (!_tcsncmp (rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -178,7 +178,7 @@ if (!_tcsncmp(rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -206,7 +206,7 @@ if (!_tcsncmp(rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -217,7 +217,7 @@ if (lpDir == NULL) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -42,7 +42,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -63,7 +63,7 @@ ConOutPuts (param); else { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), bEcho ? D_ON : D_OFF); + ConOutPrintf ((LPTSTR)szMsg, bEcho ? D_ON : D_OFF); } } @@ -81,7 +81,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } @@ -104,7 +104,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } @@ -137,7 +137,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/error.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -72,7 +72,7 @@ else { LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), dwErrorCode); + ConErrPrintf ((LPTSTR)szMsg, dwErrorCode); return; } @@ -94,7 +94,7 @@ default: LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return; } @@ -109,7 +109,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), ch); + ConErrPrintf ((LPTSTR)szMsg, ch); } @@ -117,7 +117,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), ch); + ConErrPrintf ((LPTSTR)szMsg, ch); } @@ -125,7 +125,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), s); + ConErrPrintf ((LPTSTR)szMsg, s); } @@ -133,7 +133,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -141,7 +141,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -157,7 +157,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -165,7 +165,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -173,7 +173,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -181,7 +181,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -189,7 +189,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -197,7 +197,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), s); + ConErrPrintf ((LPTSTR)szMsg, s); } @@ -208,9 +208,9 @@ LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); if (s) - ConErrPrintf (_T("%s - %s\n"),_T((LPTSTR)szMsg), s); + ConErrPrintf (_T("%s - %s\n"),(LPTSTR)szMsg, s); else - ConErrPrintf (_T("%s.\n"), _T((LPTSTR)szMsg) ); + ConErrPrintf (_T("%s.\n"), (LPTSTR)szMsg ); } @@ -219,5 +219,5 @@ WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); } _____ Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/for.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -25,9 +25,13 @@ * 23-Feb-2001 (Carl Nettelblad <cnettel(a)hem.passagen.se>) * Implemented preservation of echo flag. Some other for related * code in other files fixed, too. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" /* @@ -49,6 +53,7 @@ LPBATCH_CONTEXT lpNew; LPTSTR pp; TCHAR var; + WCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param); @@ -56,17 +61,9 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Runs a specified command for each file in a set of files\n" - "\n" - "FOR %variable IN (set) DO command [parameters]\n" - "\n" - " %variable Specifies a replaceable parameter.\n" - " (set) Specifies a set of one or more files. Wildcards may be used.\n" - " command Specifies the command to carry out for each file.\n" - " parameters Specifies parameters or switches for the specified command.\n" - "\n" - "To user the FOR comamnd in a batch program, specify %%variable instead of\n" - "%variable.")); + LoadString( GetModuleHandle(NULL), STRING_FOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } @@ -86,7 +83,8 @@ /* Check next element is 'IN' */ if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2))) { - error_syntax (_T("'in' missing in for statement.")); + LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + error_syntax ((LPTSTR)szMsg); return 1; [truncated at 1000 lines; 163 more skipped]

19 years, 8 months

[greatlrd] 14847: Remove all hardcode string to En.rc

by greatlrd＠svn.reactos.com

Remove all hardcode string to En.rc from echo.c and error.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 14:48:28 UTC (rev 14846) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 17:44:34 UTC (rev 14847) @@ -6,6 +6,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n \ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n \ [/S [/D]]\n\n \ @@ -209,7 +210,25 @@ STRING_DIRSTACK_HELP4, "Directory stack empty" +STRING_ECHO_HELP1, "Display a messages without trailing carridge return and line feed.\n\n \ + ECHOS message" +STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n \ + ECHOERR message\n \ + ECHOERR. prints an empty line" + +STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carridge return and line feed.\n\n \ + ECHOSERR message" + +STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n \ + ECHO [ON | OFF]\n \ + ECHO [message]\n \ + ECHO. prints an empty line\n\n \ +Type ECHO without a parameter to display the current ECHO setting." + +STRING_ECHO_HELP5, "ECHO is %s\n" + + STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" STRING_MKDIR_HELP, "Creates a directory.\n\n \ @@ -223,13 +242,8 @@ + - - - - - - STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" STRING_DEL_OPTION, "AENPQSTWXYZ" @@ -267,7 +281,24 @@ STRING_DEL_ERROR6, "Are you sure (Y/N)?" STRING_DEL_ERROR7, "Deleting: %s\n" STRING_DEL_ERROR8, "No Wildcards!\n" +STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" +STRING_ERROR_ERROR2, "Syntax error" + STRING_PARAM_ERROR, "Required parameter missing\n" +STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" +STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" +STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n" +STRING_ERROR_PATH_NOT_FOUND, "Path not found\n" +STRING_ERROR_FILE_NOT_FOUND, "File not found\n" +STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" +STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" +STRING_ERROR_BADCOMMAND, "Bad command or filename\n" +STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" +STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" +STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." +STRING_ERROR_DRIVER_NOT_READY "Drive not ready" + } _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 14:48:28 UTC (rev 14846) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 17:44:34 UTC (rev 14847) @@ -22,26 +22,27 @@ * * 13-Jul-2000 (Eric Kohl <ekohl(a)rz-online.de>) * Implemented 'echo.' and 'echoerr.'. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" INT CommandEcho (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + #ifdef _DEBUG DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays a message or switches command echoing on or off.\n" - "\n" - " ECHO [ON | OFF]\n" - " ECHO [message]\n" - " ECHO. prints an empty line\n" - "\n" - "Type ECHO without a parameter to display the current ECHO setting.")); + LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); return 0; } @@ -60,8 +61,10 @@ bEcho = TRUE; else if (*param) ConOutPuts (param); - else - ConOutPrintf (_T("ECHO is %s\n"), bEcho ? D_ON : D_OFF); + else { + LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), bEcho ? D_ON : D_OFF); + } } return 0; @@ -69,15 +72,17 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + #ifdef _DEBUG DebugPrintf (_T("CommandEchos '%s' : '%s'\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Display a messages without trailing carridge return and line feed.\n" - "\n" - " ECHOS message")); + LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts(_T((LPTSTR)szMsg)); + return 0; } @@ -90,16 +95,17 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + #ifdef _DEBUG DebugPrintf (_T("CommandEchoerr '%s' : '%s'\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays a message to the standard error.\n" - "\n" - " ECHOERR message\n" - " ECHOERR. prints an empty line")); + LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts(_T((LPTSTR)szMsg)); + return 0; } @@ -120,15 +126,19 @@ INT CommandEchoserr (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + #ifdef _DEBUG DebugPrintf (_T("CommandEchoserr '%s' : '%s'\n"), cmd, param); #endif + + if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Prints a messages to standard error output without trailing carridge return and line feed.\n" - "\n" - " ECHOSERR message")); + LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts(_T((LPTSTR)szMsg)); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-04-28 14:48:28 UTC (rev 14846) +++ trunk/reactos/subsys/system/cmd/error.c 2005-04-28 17:44:34 UTC (rev 14847) @@ -15,11 +15,15 @@ * * 02-Feb-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Use FormatMessage() for error reports. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" - +/* #define PARAMETERF_ERROR _T("Parameter format not correct - %c\n") #define INVALID_SWITCH _T("Invalid switch - /%c\n") #define TOO_MANY_PARAMETERS _T("Too many parameters - %s\n") @@ -33,14 +37,17 @@ #define CANNOTPIPE _T("Error! Cannot pipe! Cannot open temporary file!\n") #define D_PAUSEMSG _T("Press any key to continue . . .") +*/ - VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) { TCHAR szMessage[1024]; +#ifndef __REACTOS__ LPTSTR szError; +#endif va_list arg_ptr; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (dwErrorCode == ERROR_SUCCESS) return; @@ -64,7 +71,8 @@ } else { - ConErrPrintf (_T("Unknown error! Error code: 0x%lx\n"), dwErrorCode); + LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), dwErrorCode); return; } @@ -72,112 +80,144 @@ switch (dwErrorCode) { - case ERROR_FILE_NOT_FOUND: - szError = _T("File not found"); + case ERROR_FILE_NOT_FOUND: + LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); break; case ERROR_PATH_NOT_FOUND: - szError = _T("Path not found"); + LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); break; case ERROR_NOT_READY: - szError = _T("Drive not ready"); + LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVER_NOT_READY, (LPTSTR) szMsg,sizeof(szMsg)); break; default: - ConErrPrintf (_T("Unknown error! Error code: 0x%lx\n"), dwErrorCode); + LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); return; } if (szFormat) - ConErrPrintf (_T("%s -- %s\n"), szError, szMessage); + ConErrPrintf (_T("%s -- %s\n"), szMsg, szMessage); else - ConErrPrintf (_T("%s\n"), szError); + ConErrPrintf (_T("%s\n"), szMsg); #endif } VOID error_parameter_format(TCHAR ch) { - ConErrPrintf (PARAMETERF_ERROR, ch); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), ch); } VOID error_invalid_switch (TCHAR ch) -{ - ConErrPrintf (INVALID_SWITCH, ch); +{ + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), ch); } VOID error_too_many_parameters (LPTSTR s) { - ConErrPrintf (TOO_MANY_PARAMETERS, s); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), s); } VOID error_path_not_found (VOID) { - ConErrPrintf (PATH_NOT_FOUND); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); } VOID error_file_not_found (VOID) { - ConErrPrintf (FILE_NOT_FOUND); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); } VOID error_sfile_not_found (LPTSTR f) { - ConErrPrintf (FILE_NOT_FOUND _T(" - %s\n"), f); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ("%s - %s\n", (LPTSTR)szMsg,f); } VOID error_req_param_missing (VOID) { - ConErrPrintf (REQ_PARAM_MISSING); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); } VOID error_invalid_drive (VOID) { - ConErrPrintf (INVALID_DRIVE); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); } VOID error_bad_command (VOID) { - ConErrPrintf (BADCOMMAND); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); } VOID error_no_pipe (VOID) { - ConErrPrintf (CANNOTPIPE); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); } VOID error_out_of_memory (VOID) { - ConErrPrintf (OUT_OF_MEMORY); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); } VOID error_invalid_parameter_format (LPTSTR s) { - ConErrPrintf (INVALID_PARAM_FORMAT, s); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), s); } VOID error_syntax (LPTSTR s) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + + LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); + if (s) - ConErrPrintf (_T("Syntax error - %s\n"), s); + ConErrPrintf (_T("%s - %s\n"),_T((LPTSTR)szMsg), s); else - ConErrPrintf (_T("Syntax error.\n")); + ConErrPrintf (_T("%s.\n"), _T((LPTSTR)szMsg) ); } VOID msg_pause (VOID) { - ConOutPuts (D_PAUSEMSG); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + + LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 14:48:28 UTC (rev 14846) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 17:44:34 UTC (rev 14847) @@ -1,5 +1,20 @@ #define RC_STRING_MAX_SIZE 2048 + +#define STRING_ERROR_PARAMETERF_ERROR 100 +#define STRING_ERROR_INVALID_SWITCH 101 +#define STRING_ERROR_TOO_MANY_PARAMETERS 102 +#define STRING_ERROR_PATH_NOT_FOUND 103 +#define STRING_ERROR_FILE_NOT_FOUND 104 +#define STRING_ERROR_REQ_PARAM_MISSING 105 +#define STRING_ERROR_INVALID_DRIVE 106 +#define STRING_ERROR_INVALID_PARAM_FORMAT 107 +#define STRING_ERROR_BADCOMMAND 108 +#define STRING_ERROR_OUT_OF_MEMORY 109 +#define STRING_ERROR_CANNOTPIPE 110 +#define STRING_ERROR_D_PAUSEMSG 111 +#define STRING_ERROR_DRIVER_NOT_READY 112 + #define STRING_CHOICE_OPTION 200 #define STRING_COPY_OPTION 201 #define STRING_DEL_OPTION 202 @@ -36,8 +51,11 @@ #define STRING_DEL_ERROR6 329 #define STRING_DEL_ERROR7 330 #define STRING_DEL_ERROR8 331 -#define STRING_PARAM_ERROR 332 +#define STRING_ERROR_ERROR1 332 +#define STRING_ERROR_ERROR2 333 +#define STRING_PARAM_ERROR 334 + #define STRING_ATTRIB_HELP 400 #define STRING_ALIAS_HELP 401 #define STRING_BEEP_HELP 402 @@ -81,13 +99,19 @@ #define STRING_DIRSTACK_HELP3 438 #define STRING_DIRSTACK_HELP4 439 -#define STRING_EXIT_HELP 440 -#define STRING_MKDIR_HELP 441 -#define STRING_RMDIR_HELP 442 -#define STRING_REM_HELP 443 +#define STRING_ECHO_HELP1 440 +#define STRING_ECHO_HELP2 441 +#define STRING_ECHO_HELP3 442 +#define STRING_ECHO_HELP4 443 +#define STRING_ECHO_HELP5 444 +#define STRING_EXIT_HELP 445 +#define STRING_MKDIR_HELP 446 +#define STRING_RMDIR_HELP 447 +#define STRING_REM_HELP 448 +

19 years, 8 months

[fireball] 14846: Added Nls\Locale registry tree, it corresponds to locales I imported from WINE a few revisions ago.

by fireball＠svn.reactos.com

Added Nls\Locale registry tree, it corresponds to locales I imported from WINE a few revisions ago. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-04-28 13:55:35 UTC (rev 14845) +++ trunk/reactos/bootdata/hivesys.inf 2005-04-28 14:48:28 UTC (rev 14846) @@ -179,12 +179,105 @@ ; Suported and installed locales HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x0001000 1,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x0001000 1,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x0001000 1,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x0001000 1,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00010001 ,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000807",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c07",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001407",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000408",0x0001000 1,"4" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000409",0x00010001 ,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000809",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c09",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001009",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001409",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001809",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c09",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002009",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003009",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003409",0x0001000 1,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040a",0x00010001 ,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100a",0x0001000 1,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140a",0x000100 01,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c0a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000200a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000240a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000280a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002c0a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000300a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000340a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000380a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003c0a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000400a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000440a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000480a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00004c0a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000500a",0x0001000 1,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040b",0x00010001 ,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040c",0x00010001 ,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080c",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0c",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x0001000 1,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x0001000 1,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x0001000 1,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x000100 01,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x000100 01,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000414",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000814",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000415",0x0001000 1,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000416",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000816",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000418",0x0001000 1,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000419",0x00010001 ,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041a",0x0001000 1,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081a",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c1a",0x0001000 1,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x0001000 1,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x0001000 1,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x0001000 1,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x0001000 1,"6" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x000100 01,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000422",0x0001000 1,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000423",0x0001000 1,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000424",0x0001000 1,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000425",0x0001000 1,"3" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x0001000 1,"3" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x000100 01,"3" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x000100 01,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x000100 01,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x000100 01,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x000100 01,"6" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x000100 01,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x0001000 1,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x0001000 1,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x000100 01,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x0001000 1,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x0001000 1,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x0001000 1,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x000100 01,"5" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000440",0x000100 01,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000441",0x0001000 1,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000443",0x000100 01,"6" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000843",0x0001000 1,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000456",0x0001000 1,"1" ; Some installers check for SP6 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001, 0x00000600

19 years, 8 months

[greatlrd] 14845: Fix all these warings

by greatlrd＠svn.reactos.com

Fix all these warings libnurbs/nurbtess/sampleComp.cc: In function `void sampleCompLeft(Real*, Real*, vertexArray*, Int, Int, vertexArray*, Int, Int, gridBoundaryChain*, Int, Int, Int, Int, Int, Int, primStream*)': libnurbs/nurbtess/sampleComp.cc:162: warning: 'gridMidIndex1' might be used uninitialized in this function libnurbs/nurbtess/sampleComp.cc:162: warning: 'gridMidIndex2' might be used uninitialized in this function libnurbs/nurbtess/sampleCompRight.cc: In function `void sampleCompRight(Real*, Real*, vertexArray*, Int, Int, vertexArray*, Int, Int, gridBoundaryChain*, Int, Int, Int, Int, Int, Int, primStream*)': libnurbs/nurbtess/sampleCompRight.cc:75: warning: 'gridMidIndex1' might be used uninitialized in this function libnurbs/nurbtess/sampleCompRight.cc:75: warning: 'gridMidIndex2' might be used uninitialized in this function Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleComp.cc Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.cc _____ Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleComp.cc --- trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleComp.cc 2005-04-28 13:54:19 UTC (rev 14844) +++ trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleComp.cc 2005-04-28 13:55:35 UTC (rev 14845) @@ -157,9 +157,9 @@ /*find out whether there is a trim vertex which is *inbetween the top and bot grid lines or not. */ - Int midIndex1; - Int midIndex2; - Int gridMidIndex1, gridMidIndex2; + Int midIndex1 = 0; + Int midIndex2 = 0; + Int gridMidIndex1 = 0, gridMidIndex2 = 0; //midIndex1: array[i] <= v, array[i-1] > v //midIndex2: array[i] >= v, array[i+1] < v // v(gridMidIndex1) >= v(midindex1) > v(gridMidIndex1+1) _____ Modified: trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.cc --- trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.cc 2005-04-28 13:54:19 UTC (rev 14844) +++ trunk/reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.cc 2005-04-28 13:55:35 UTC (rev 14845) @@ -72,7 +72,7 @@ */ Int midIndex1; Int midIndex2; - Int gridMidIndex1, gridMidIndex2; + Int gridMidIndex1 =0, gridMidIndex2 =0; //midIndex1: array[i] <= v, array[i+1] > v //midIndex2: array[i] >= v, array[i+1] < v midIndex1 = rightChain->findIndexBelowGen(rightGridChain->get_v_value(gridIndex1),

19 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005