Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 14847: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

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 +

1 0

[fireball] 14846: Added Nls\Locale registry tree, it corresponds to locales I imported from WINE a few revisions ago.
by fireball＠svn.reactos.com 28 Apr '05

28 Apr '05

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

1 0

[greatlrd] 14845: Fix all these warings
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

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),

1 0

[fireball] 14844: Imported locales information from WINE. Sorry it isn't done the "right way" (store all info in locales.nls as WinXP does), but for now I think this way will do.
by fireball＠svn.reactos.com 28 Apr '05

28 Apr '05

Imported locales information from WINE. Sorry it isn't done the "right way" (store all info in locales.nls as WinXP does), but for now I think this way will do. Also some locales aren't imported because their info contains unicode characters, and I didn't want to switch kernel32 from windres to wrc. Modified: trunk/reactos/lib/kernel32/locale_rc.rc Added: trunk/reactos/lib/kernel32/nls/afk.nls Added: trunk/reactos/lib/kernel32/nls/bel.nls Added: trunk/reactos/lib/kernel32/nls/bgr.nls Added: trunk/reactos/lib/kernel32/nls/cat.nls Added: trunk/reactos/lib/kernel32/nls/chs.nls Added: trunk/reactos/lib/kernel32/nls/cht.nls Added: trunk/reactos/lib/kernel32/nls/csy.nls Added: trunk/reactos/lib/kernel32/nls/dan.nls Added: trunk/reactos/lib/kernel32/nls/dea.nls Added: trunk/reactos/lib/kernel32/nls/dec.nls Added: trunk/reactos/lib/kernel32/nls/del.nls Added: trunk/reactos/lib/kernel32/nls/des.nls Added: trunk/reactos/lib/kernel32/nls/ell.nls Added: trunk/reactos/lib/kernel32/nls/ena.nls Added: trunk/reactos/lib/kernel32/nls/enb.nls Added: trunk/reactos/lib/kernel32/nls/enc.nls Modified: trunk/reactos/lib/kernel32/nls/eng.nls Added: trunk/reactos/lib/kernel32/nls/eni.nls Added: trunk/reactos/lib/kernel32/nls/enj.nls Added: trunk/reactos/lib/kernel32/nls/enl.nls Added: trunk/reactos/lib/kernel32/nls/enp.nls Added: trunk/reactos/lib/kernel32/nls/ens.nls Added: trunk/reactos/lib/kernel32/nls/ent.nls Added: trunk/reactos/lib/kernel32/nls/enw.nls Added: trunk/reactos/lib/kernel32/nls/enz.nls Added: trunk/reactos/lib/kernel32/nls/esa.nls Added: trunk/reactos/lib/kernel32/nls/esb.nls Added: trunk/reactos/lib/kernel32/nls/esd.nls Added: trunk/reactos/lib/kernel32/nls/ese.nls Added: trunk/reactos/lib/kernel32/nls/esf.nls Added: trunk/reactos/lib/kernel32/nls/esg.nls Added: trunk/reactos/lib/kernel32/nls/esh.nls Added: trunk/reactos/lib/kernel32/nls/esi.nls Added: trunk/reactos/lib/kernel32/nls/esl.nls Added: trunk/reactos/lib/kernel32/nls/esm.nls Added: trunk/reactos/lib/kernel32/nls/esn.nls Added: trunk/reactos/lib/kernel32/nls/eso.nls Added: trunk/reactos/lib/kernel32/nls/esp.nls Added: trunk/reactos/lib/kernel32/nls/esr.nls Added: trunk/reactos/lib/kernel32/nls/ess.nls Added: trunk/reactos/lib/kernel32/nls/esu.nls Added: trunk/reactos/lib/kernel32/nls/esv.nls Added: trunk/reactos/lib/kernel32/nls/esy.nls Added: trunk/reactos/lib/kernel32/nls/esz.nls Added: trunk/reactos/lib/kernel32/nls/eti.nls Added: trunk/reactos/lib/kernel32/nls/euq.nls Added: trunk/reactos/lib/kernel32/nls/fin.nls Added: trunk/reactos/lib/kernel32/nls/fos.nls Added: trunk/reactos/lib/kernel32/nls/frb.nls Added: trunk/reactos/lib/kernel32/nls/frc.nls Added: trunk/reactos/lib/kernel32/nls/frl.nls Added: trunk/reactos/lib/kernel32/nls/frm.nls Added: trunk/reactos/lib/kernel32/nls/frs.nls Added: trunk/reactos/lib/kernel32/nls/glc.nls Added: trunk/reactos/lib/kernel32/nls/heb.nls Added: trunk/reactos/lib/kernel32/nls/hrv.nls Added: trunk/reactos/lib/kernel32/nls/hun.nls Added: trunk/reactos/lib/kernel32/nls/ind.nls Added: trunk/reactos/lib/kernel32/nls/isl.nls Added: trunk/reactos/lib/kernel32/nls/ita.nls Added: trunk/reactos/lib/kernel32/nls/its.nls Added: trunk/reactos/lib/kernel32/nls/lvi.nls Added: trunk/reactos/lib/kernel32/nls/mki.nls Added: trunk/reactos/lib/kernel32/nls/msb.nls Added: trunk/reactos/lib/kernel32/nls/msl.nls Added: trunk/reactos/lib/kernel32/nls/nlb.nls Added: trunk/reactos/lib/kernel32/nls/nld.nls Added: trunk/reactos/lib/kernel32/nls/non.nls Added: trunk/reactos/lib/kernel32/nls/nor.nls Added: trunk/reactos/lib/kernel32/nls/plk.nls Added: trunk/reactos/lib/kernel32/nls/ptb.nls Added: trunk/reactos/lib/kernel32/nls/ptg.nls Added: trunk/reactos/lib/kernel32/nls/rom.nls Added: trunk/reactos/lib/kernel32/nls/rus.nls Added: trunk/reactos/lib/kernel32/nls/sky.nls Added: trunk/reactos/lib/kernel32/nls/slv.nls Added: trunk/reactos/lib/kernel32/nls/sqi.nls Added: trunk/reactos/lib/kernel32/nls/srb.nls Added: trunk/reactos/lib/kernel32/nls/srl.nls Added: trunk/reactos/lib/kernel32/nls/sve.nls Added: trunk/reactos/lib/kernel32/nls/svf.nls Added: trunk/reactos/lib/kernel32/nls/swk.nls Added: trunk/reactos/lib/kernel32/nls/tam.nls Added: trunk/reactos/lib/kernel32/nls/tha.nls Added: trunk/reactos/lib/kernel32/nls/trk.nls Added: trunk/reactos/lib/kernel32/nls/ukr.nls Added: trunk/reactos/lib/kernel32/nls/uzb.nls Added: trunk/reactos/lib/kernel32/nls/zhi.nls _____ Modified: trunk/reactos/lib/kernel32/locale_rc.rc --- trunk/reactos/lib/kernel32/locale_rc.rc 2005-04-28 13:50:32 UTC (rev 14843) +++ trunk/reactos/lib/kernel32/locale_rc.rc 2005-04-28 13:54:19 UTC (rev 14844) @@ -24,16 +24,10 @@ #define LGRPID_RES_BASE 0x2000 -#include "nls/deu.nls" /* 0x0407 LANG_GERMAN, SUBLANG_GERMAN */ -#include "nls/fra.nls" /* 0x040c LANG_FRENCH, SUBLANG_FRENCH */ -#include "nls/enu.nls" /* 0x0409 LANG_ENGLISH, SUBLANG_ENGLISH_US */ -#include "nls/eng.nls" /* 0x0809 LANG_ENGLISH, SUBLANG_ENGLISH_UK */ - /* add languages in numerical order of main language (last two digits) * it is much easier to find the missing holes that way */ -#if 0 //TODO - +#if 0 #include "nls/ara.nls" /* 0x0401 LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA */ #include "nls/ari.nls" /* 0x0801 LANG_ARABIC, SUBLANG_ARABIC_IRAQ */ #include "nls/are.nls" /* 0x0c01 LANG_ARABIC, SUBLANG_ARABIC_EGYPT */ @@ -50,6 +44,7 @@ #include "nls/aru.nls" /* 0x3801 LANG_ARABIC, SUBLANG_ARABIC_UAE */ #include "nls/arh.nls" /* 0x3c01 LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN */ #include "nls/arq.nls" /* 0x4001 LANG_ARABIC, SUBLANG_ARABIC_QATAR */ +#endif #include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_DEFAULT */ @@ -57,9 +52,9 @@ #include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ -#include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */ +//#include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */ #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ -#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ +//#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ #include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ @@ -91,7 +86,7 @@ #include "nls/esm.nls" /* 0x080a LANG_SPANISH, SUBLANG_SPANISH_MEXICAN */ #include "nls/esn.nls" /* 0x0c0a LANG_SPANISH, SUBLANG_SPANISH_MODERN */ #include "nls/esg.nls" /* 0x100a LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA */ -#include "nls/esc.nls" /* 0x140a LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA */ +//#include "nls/esc.nls" /* 0x140a LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA */ #include "nls/esa.nls" /* 0x180a LANG_SPANISH, SUBLANG_SPANISH_PANAMA */ #include "nls/esd.nls" /* 0x1c0a LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC */ #include "nls/esv.nls" /* 0x200a LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA */ @@ -126,9 +121,9 @@ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ +//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ -#include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ +//#include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ #include "nls/nld.nls" /* 0x0413 LANG_DUTCH, SUBLANG_DUTCH */ #include "nls/nlb.nls" /* 0x0813 LANG_DUTCH, SUBLANG_DUTCH_BELGIAN */ @@ -160,7 +155,7 @@ #include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_DEFAULT */ -#include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ +//#include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ #include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_DEFAULT */ @@ -174,16 +169,16 @@ #include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_DEFAULT */ -#include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ +//#include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ -#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ +//#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ -#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ +//#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ -#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ +//#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ -#include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ -#include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ +//#include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ +//#include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ #include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_DEFAULT */ @@ -191,72 +186,65 @@ #include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_DEFAULT */ -#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ +//#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ #include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_DEFAULT */ -#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ +//#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ #include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */ #include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */ -#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ +//#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ -#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ +//#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ #include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_DEFAULT */ -#include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ +//#include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ #include "nls/uzb.nls" /* 0x0843 LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */ -#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ +//#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ -#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ +//#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ -#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ +//#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ -#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ +//#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ -#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ +//#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ -#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ +//#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ -#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ +//#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ -#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ +//#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ -#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ +//#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ #include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_DEFAULT */ -#include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_DEFAULT */ +//#include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_DEFAULT */ -#include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ +//#include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ -#include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ +//#include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ -#endif //TODO - -#if 0 - /* Wine extensions */ -#include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ +//#include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ -#include "nls/gae.nls" /* 0x043c LANG_GAELIC, SUBLANG_GAELIC */ -#include "nls/gdh.nls" /* 0x083c LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */ -#include "nls/gdv.nls" /* 0x0c3c LANG_GAELIC, SUBLANG_GAELIC_MANX */ +//#include "nls/gae.nls" /* 0x043c LANG_GAELIC, SUBLANG_GAELIC */ +//#include "nls/gdh.nls" /* 0x083c LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */ +//#include "nls/gdv.nls" /* 0x0c3c LANG_GAELIC, SUBLANG_GAELIC_MANX */ -#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ +//#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ -#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */ +//#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */ -#include "nls/cor.nls" /* 0x0491 LANG_CORNISH, SUBLANG_DEFAULT */ +//#include "nls/cor.nls" /* 0x0491 LANG_CORNISH, SUBLANG_DEFAULT */ -#include "nls/cym.nls" /* 0x0492 LANG_WELSH, SUBLANG_DEFAULT */ +//#include "nls/cym.nls" /* 0x0492 LANG_WELSH, SUBLANG_DEFAULT */ -#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_DEFAULT */ - -#endif - +//#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_DEFAULT */ _____ Added: trunk/reactos/lib/kernel32/nls/afk.nls --- trunk/reactos/lib/kernel32/nls/afk.nls 2005-04-28 13:50:32 UTC (rev 14843) +++ trunk/reactos/lib/kernel32/nls/afk.nls 2005-04-28 13:54:19 UTC (rev 14844) @@ -0,0 +1,154 @@ +/* + * Locale definitions for Afrikaans + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT +{ +//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x00ff\x003f\x0000\xffff" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "27" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "2" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "27" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0436" +//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28591" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0436" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "2" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "0" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "nm" + LOCALE_SABBREVCTRYNAME "ZAF" + LOCALE_SABBREVDAYNAME1 "Maan" + LOCALE_SABBREVDAYNAME2 "Dins" + LOCALE_SABBREVDAYNAME3 "Woen" + LOCALE_SABBREVDAYNAME4 "Dond" + LOCALE_SABBREVDAYNAME5 "Vry" + LOCALE_SABBREVDAYNAME6 "Sat" + LOCALE_SABBREVDAYNAME7 "Son" + LOCALE_SABBREVLANGNAME "AFK" + LOCALE_SABBREVMONTHNAME1 "Jan" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Apr" + LOCALE_SABBREVMONTHNAME5 "Mei" + LOCALE_SABBREVMONTHNAME6 "Jun" + LOCALE_SABBREVMONTHNAME7 "Jul" + LOCALE_SABBREVMONTHNAME8 "Aug" + LOCALE_SABBREVMONTHNAME9 "Sep" + LOCALE_SABBREVMONTHNAME10 "Okt" + LOCALE_SABBREVMONTHNAME11 "Nov" + LOCALE_SABBREVMONTHNAME12 "Des" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "South Africa" + LOCALE_SCURRENCY "R" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Maandag" + LOCALE_SDAYNAME2 "Dinsdag" + LOCALE_SDAYNAME3 "Woensdag" + LOCALE_SDAYNAME4 "Donderdag" + LOCALE_SDAYNAME5 "Vrydag" + LOCALE_SDAYNAME6 "Saterdag" + LOCALE_SDAYNAME7 "Sondag" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "South Africa" + LOCALE_SENGCURRNAME "South African Rand" + LOCALE_SENGLANGUAGE "Afrikaans" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "ZAR" + LOCALE_SISO3166CTRYNAME "ZA" + LOCALE_SISO639LANGNAME "af" + LOCALE_SLANGUAGE "Afrikaans" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Januarie" + LOCALE_SMONTHNAME2 "Februarie" + LOCALE_SMONTHNAME3 "Maart" + LOCALE_SMONTHNAME4 "April" + LOCALE_SMONTHNAME5 "Mei" + LOCALE_SMONTHNAME6 "Junie" + LOCALE_SMONTHNAME7 "Julie" + LOCALE_SMONTHNAME8 "Augustus" + LOCALE_SMONTHNAME9 "September" + LOCALE_SMONTHNAME10 "Oktober" + LOCALE_SMONTHNAME11 "November" + LOCALE_SMONTHNAME12 "Desember" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNATIVECTRYNAME "Suid Afrika" + LOCALE_SNATIVECURRNAME "Rand" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Afrikaans" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "yyyy/MM/dd" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "hh:mm:ss tt" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} _____ Added: trunk/reactos/lib/kernel32/nls/bel.nls --- trunk/reactos/lib/kernel32/nls/bel.nls 2005-04-28 13:50:32 UTC (rev 14843) +++ trunk/reactos/lib/kernel32/nls/bel.nls 2005-04-28 13:54:19 UTC (rev 14844) @@ -0,0 +1,154 @@ +/* + * Locale definitions for Belarusian + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#pragma code_page(1251) + +STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT +{ +//FIXME LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x00 02\x0004\x0000\x0000\x0202" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "375" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1251" + LOCALE_IDEFAULTCODEPAGE "866" + LOCALE_IDEFAULTCOUNTRY "375" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0423" +//FIXME LOCALE_IDEFAULTMACCODEPAGE "10007" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "1251" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0423" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "BLR" + LOCALE_SABBREVDAYNAME1 "´Ý" + LOCALE_SABBREVDAYNAME2 "Óó" + LOCALE_SABBREVDAYNAME3 "±" + LOCALE_SABBREVDAYNAME4 "¸÷" + LOCALE_SABBREVDAYNAME5 "´?" + LOCALE_SABBREVDAYNAME6 "±ß" + LOCALE_SABBREVDAYNAME7 "Ýõ" + LOCALE_SABBREVLANGNAME "BEL" + LOCALE_SABBREVMONTHNAME1 "Ð?¾" + LOCALE_SABBREVMONTHNAME2 "???" + LOCALE_SABBREVMONTHNAME3 "ÐÓÛ" + LOCALE_SABBREVMONTHNAME4 "?Ó" + LOCALE_SABBREVMONTHNAME5 "?ÓÚ" + LOCALE_SABBREVMONTHNAME6 "Î²" + LOCALE_SABBREVMONTHNAME7 "??´" + LOCALE_SABBREVMONTHNAME8 "ãÝ?" + LOCALE_SABBREVMONTHNAME9 "?Õ" + LOCALE_SABBREVMONTHNAME10 "?Ó±" + LOCALE_SABBREVMONTHNAME11 "??±" + LOCALE_SABBREVMONTHNAME12 "ÐÝÕ" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Belarus" + LOCALE_SCURRENCY "¾ß." + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "´ÓÝ õþÕÙÓÛ" + LOCALE_SDAYNAME2 "Óó?¯ÓÛ" + LOCALE_SDAYNAME3 "±ÕÓõÓ" + LOCALE_SDAYNAME4 "¸Ó÷ÔÕ" + LOCALE_SDAYNAME5 "´ ?Ý?÷Ó" + LOCALE_SDAYNAME6 "±¾ß¯?Ó" + LOCALE_SDAYNAME7 "Ý õþÕÙ " + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Belarus" + LOCALE_SENGCURRNAME "Belarusian Ruble" + LOCALE_SENGLANGUAGE "Belarusian" + LOCALE_SGROUPING "3;3" + LOCALE_SINTLSYMBOL "BYR" + LOCALE_SISO3166CTRYNAME "BY" + LOCALE_SISO639LANGNAME "be" + LOCALE_SLANGUAGE "Belarusian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "d MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;3" + LOCALE_SMONTHNAME1 "Ð?¾õþÕÝ³" + LOCALE_SMONTHNAME2 "???¹" + LOCALE_SMONTHNAME3 "ÐÓÛÓÔ?Û" + LOCALE_SMONTHNAME4 "?Ó±ÓÔ?Û" + LOCALE_SMONTHNAME5 "?ÓÚ" + LOCALE_SMONTHNAME6 "Î²ÔÕÝ³" + LOCALE_SMONTHNAME7 "??´ÕÝ³" + LOCALE_SMONTHNAME8 "ãÝ?ÔÕÝ³" + LOCALE_SMONTHNAME9 "?ÕÓ±ÕÝ³" + LOCALE_SMONTHNAME10 "?Ó±?¹¸Ý?Û" + LOCALE_SMONTHNAME11 "??±?Ó´Óõ" + LOCALE_SMONTHNAME12 "ÐÝÕµÓÝ³" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP " " + LOCALE_SNATIVECTRYNAME "?ÕÙÓ¾±³" + LOCALE_SNATIVECURRNAME "¾ßÕÙ³" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "?ÕÙÓ¾±ÛÓ " + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "dd.MM.yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND " " + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} _____ Added: trunk/reactos/lib/kernel32/nls/bgr.nls --- trunk/reactos/lib/kernel32/nls/bgr.nls 2005-04-28 13:50:32 UTC (rev 14843) +++ trunk/reactos/lib/kernel32/nls/bgr.nls 2005-04-28 13:54:19 UTC (rev 14844) @@ -0,0 +1,154 @@ +/* + * Locale definitions for Bulgarian + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#pragma code_page(1251) + +STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +{ +//FIXME LOCALE_FONTSIGNATURE L"\x0203\x8000\x3848\x0000\x0000\x0000\x0000\x0000\x0004\x0000\x0000\x00 02\x0004\x0000\x0000\x0202" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "359" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1251" + LOCALE_IDEFAULTCODEPAGE "866" + LOCALE_IDEFAULTCOUNTRY "359" + LOCALE_IDEFAULTEBCDICCODEPAGE "20420" + LOCALE_IDEFAULTLANGUAGE "0402" +//FIXME LOCALE_IDEFAULTMACCODEPAGE "10007" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "1251" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0402" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "BGR" + LOCALE_SABBREVDAYNAME1 "´¯ÝÕõÕÙÝÞÛ" + LOCALE_SABBREVDAYNAME2 "Ô?¯ÝÞÛ" + LOCALE_SABBREVDAYNAME3 "± õÓ" + LOCALE_SABBREVDAYNAME4 "¸Õ?Ô·?·Û" + LOCALE_SABBREVDAYNAME5 "´Õ?·Û" + LOCALE_SABBREVDAYNAME6 "±·ß¯?Ó" + LOCALE_SABBREVDAYNAME7 "ÝÕõÕÙ " + LOCALE_SABBREVLANGNAME "BGR" + LOCALE_SABBREVMONTHNAME1 "?Ý¾ÓÞ" + LOCALE_SABBREVMONTHNAME2 "ÈÕÔ¾ÓÞ" + LOCALE_SABBREVMONTHNAME3 "?Ó?" + LOCALE_SABBREVMONTHNAME4 "?´ÞÙ" + LOCALE_SABBREVMONTHNAME5 "?ÓÚ" + LOCALE_SABBREVMONTHNAME6 "ÌÝÞ" + LOCALE_SABBREVMONTHNAME7 "ÌÙÞ" + LOCALE_SABBREVMONTHNAME8 "?ÔÒ¾±?" + LOCALE_SABBREVMONTHNAME9 "ÐÕ´?ÕýÔÞ" + LOCALE_SABBREVMONTHNAME10 "?Û?¯ýÔÞ" + LOCALE_SABBREVMONTHNAME11 "?¯ÕýÔÞ" + LOCALE_SABBREVMONTHNAME12 "?ÕÛÕýÔÞ" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Bulgaria" + LOCALE_SCURRENCY "ÙÔ" + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "´¯ÝÕõÕÙÝÞÛ" + LOCALE_SDAYNAME2 "Ô?¯ÝÞÛ" + LOCALE_SDAYNAME3 "± õÓ" + LOCALE_SDAYNAME4 "¸Õ?Ô·?·Û" + LOCALE_SDAYNAME5 "´Õ?·Û" + LOCALE_SDAYNAME6 "±·ß¯?Ó" + LOCALE_SDAYNAME7 "ÝÕõÕÙ " + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Bulgaria" + LOCALE_SENGCURRNAME "Bulgarian Lev" + LOCALE_SENGLANGUAGE "Bulgarian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "BGL" + LOCALE_SISO3166CTRYNAME "BG" + LOCALE_SISO639LANGNAME "bg" + LOCALE_SLANGUAGE "Bulgarian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dd MMMM yyyy 'Ò.'" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "?Ý¾ÓÞ" + LOCALE_SMONTHNAME2 "ÈÕÔ¾ÓÞ" + LOCALE_SMONTHNAME3 "?Ó?" + LOCALE_SMONTHNAME4 "?´ÞÙ" + LOCALE_SMONTHNAME5 "?ÓÚ" + LOCALE_SMONTHNAME6 "ÌÝÞ" + LOCALE_SMONTHNAME7 "ÌÙÞ" + LOCALE_SMONTHNAME8 "?ÔÒ¾±?" + LOCALE_SMONTHNAME9 "ÐÕ´?ÕýÔÞ" + LOCALE_SMONTHNAME10 "?Û?¯ýÔÞ" + LOCALE_SMONTHNAME11 "?¯ÕýÔÞ" + LOCALE_SMONTHNAME12 "?ÕÛÕýÔÞ" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "á" + LOCALE_SNATIVECTRYNAME "?·ÙÒÓÞ " + LOCALE_SNATIVECURRNAME "ÙÔ." + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "ß·ÙÒÓ±ÛÞ" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "dd.M.yyyy 'Ò.'" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "á" + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy 'Ò.'" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} _____ Added: trunk/reactos/lib/kernel32/nls/cat.nls --- trunk/reactos/lib/kernel32/nls/cat.nls 2005-04-28 13:50:32 UTC (rev 14843) +++ trunk/reactos/lib/kernel32/nls/cat.nls 2005-04-28 13:54:19 UTC (rev 14844) @@ -0,0 +1,154 @@ +/* + * Locale definitions for Catalan + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +{ +//FIXME LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x40 00\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "34" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "34" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "040a" +//FIXME LOCALE_IDEFAULTMACCODEPAGE "10000" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0403" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ESP" + LOCALE_SABBREVDAYNAME1 "dl." + LOCALE_SABBREVDAYNAME2 "dt." + LOCALE_SABBREVDAYNAME3 "dc." + LOCALE_SABBREVDAYNAME4 "dj." + LOCALE_SABBREVDAYNAME5 "dv." + LOCALE_SABBREVDAYNAME6 "ds." + LOCALE_SABBREVDAYNAME7 "dg." + LOCALE_SABBREVLANGNAME "CAT" + LOCALE_SABBREVMONTHNAME1 "gen" + LOCALE_SABBREVMONTHNAME2 "feb" + LOCALE_SABBREVMONTHNAME3 "marþ" + LOCALE_SABBREVMONTHNAME4 "abr" + LOCALE_SABBREVMONTHNAME5 "maig" + LOCALE_SABBREVMONTHNAME6 "juny" + LOCALE_SABBREVMONTHNAME7 "jul" + LOCALE_SABBREVMONTHNAME8 "ag" + LOCALE_SABBREVMONTHNAME9 "set" + LOCALE_SABBREVMONTHNAME10 "oct" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "des" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Spain" + LOCALE_SCURRENCY "Ç" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "dilluns" + LOCALE_SDAYNAME2 "dimarts" + LOCALE_SDAYNAME3 "dimecres" + LOCALE_SDAYNAME4 "dijous" + LOCALE_SDAYNAME5 "divendres" + LOCALE_SDAYNAME6 "dissabte" + LOCALE_SDAYNAME7 "diumenge" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Spain" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Catalan" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "ES" + LOCALE_SISO639LANGNAME "ca" + LOCALE_SLANGUAGE "Catalan" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "gener" + LOCALE_SMONTHNAME2 "febrer" + LOCALE_SMONTHNAME3 "marþ" + LOCALE_SMONTHNAME4 "abril" + LOCALE_SMONTHNAME5 "maig" + LOCALE_SMONTHNAME6 "juny" + LOCALE_SMONTHNAME7 "juliol" + LOCALE_SMONTHNAME8 "agost" + LOCALE_SMONTHNAME9 "setembre" + LOCALE_SMONTHNAME10 "octubre" + LOCALE_SMONTHNAME11 "novembre" + LOCALE_SMONTHNAME12 "desembre" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNATIVECTRYNAME "Espanya" + LOCALE_SNATIVECURRNAME "euro" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "catalÓ" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM' / 'yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} _____ Added: trunk/reactos/lib/kernel32/nls/chs.nls --- trunk/reactos/lib/kernel32/nls/chs.nls 2005-04-28 13:50:32 UTC (rev 14843) +++ trunk/reactos/lib/kernel32/nls/chs.nls 2005-04-28 13:54:19 UTC (rev 14844) @@ -0,0 +1,154 @@ +/* + * Locale definitions for Chinese (PRC) + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#pragma code_page(936) + +STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +{ +//FIXME LOCALE_FONTSIGNATURE L"\x02af\x8000\x6cf8\x184f\x0010\x0000\x0000\x0000\x0000\x0004\x0000\x00 00\x0000\x0004\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "86" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "2" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "936" + LOCALE_IDEFAULTCODEPAGE "936" + LOCALE_IDEFAULTCOUNTRY "86" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0804" +//FIXME LOCALE_IDEFAULTMACCODEPAGE "10008" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "936" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0804" + LOCALE_ILDATE "2" + LOCALE_ILZERO "0" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "2" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "0" + LOCALE_S1159 "?¤?þ" + LOCALE_S2359 "¤??þ" + LOCALE_SABBREVCTRYNAME "CHN" + LOCALE_SABBREVDAYNAME1 "ðÃã?Ê?" + LOCALE_SABBREVDAYNAME2 "ðÃã?Â?" + LOCALE_SABBREVDAYNAME3 "ðÃã??²" + LOCALE_SABBREVDAYNAME4 "ðÃã???" + LOCALE_SABBREVDAYNAME5 "ðÃã??Õ" + LOCALE_SABBREVDAYNAME6 "ðÃã??¨" + LOCALE_SABBREVDAYNAME7 "ðÃã??i" + LOCALE_SABBREVLANGNAME "CHS" + LOCALE_SABBREVMONTHNAME1 "Ê?È?" + LOCALE_SABBREVMONTHNAME2 "Â?È?" + LOCALE_SABBREVMONTHNAME3 "?²È?" + LOCALE_SABBREVMONTHNAME4 "??È?" + LOCALE_SABBREVMONTHNAME5 "?ÕÈ?" + LOCALE_SABBREVMONTHNAME6 "?¨È?" + LOCALE_SABBREVMONTHNAME7 "ã?È?" + LOCALE_SABBREVMONTHNAME8 "??È?" + LOCALE_SABBREVMONTHNAME9 "¥?È?" + LOCALE_SABBREVMONTHNAME10 "?«È?" + LOCALE_SABBREVMONTHNAME11 "?«Ê?È?" + LOCALE_SABBREVMONTHNAME12 "?«Â?È?" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "People's Republic of China" + LOCALE_SCURRENCY "úñ" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "ðÃã?Ê?" + LOCALE_SDAYNAME2 "ðÃã?Â?" + LOCALE_SDAYNAME3 "ðÃã??²" + LOCALE_SDAYNAME4 "ðÃã???" + LOCALE_SDAYNAME5 "ðÃã??Õ" + LOCALE_SDAYNAME6 "ðÃã??¨" + LOCALE_SDAYNAME7 "ðÃã??i" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "People's Republic of China" + LOCALE_SENGCURRNAME "PRC Yuan Renminbi" + LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "CNY" + LOCALE_SISO3166CTRYNAME "CN" + LOCALE_SISO639LANGNAME "zh" + LOCALE_SLANGUAGE "Chinese (PRC)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "yyyy'?Û'M'È?'d'?i'" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Ê?È?" + LOCALE_SMONTHNAME2 "Â?È?" + LOCALE_SMONTHNAME3 "?²È?" + LOCALE_SMONTHNAME4 "??È?" + LOCALE_SMONTHNAME5 "?ÕÈ?" + LOCALE_SMONTHNAME6 "?¨È?" + LOCALE_SMONTHNAME7 "ã?È?" + LOCALE_SMONTHNAME8 "??È?" + LOCALE_SMONTHNAME9 "¥?È?" + LOCALE_SMONTHNAME10 "?«È?" + LOCALE_SMONTHNAME11 "?«Ê?È?" + LOCALE_SMONTHNAME12 "?«Â?È?" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNATIVECTRYNAME "Íð?¬???±?????·" + LOCALE_SNATIVECURRNAME "???±?Ê" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Íð??(???Õ)" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "yyyy-M-d" + LOCALE_SSORTNAME "Pronunciation" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "yyyy'?Û'M'È?'" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} _____ Added: trunk/reactos/lib/kernel32/nls/cht.nls --- trunk/reactos/lib/kernel32/nls/cht.nls 2005-04-28 13:50:32 UTC (rev 14843) +++ trunk/reactos/lib/kernel32/nls/cht.nls 2005-04-28 13:54:19 UTC (rev 14844) @@ -0,0 +1,154 @@ +/* + * Locale definitions for Chinese (Taiwan) + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or [truncated at 1000 lines; 13041 more skipped]

1 0

[fireball] 14843: Imported LANG_ and SUBLANG_ defines from WINE
by fireball＠svn.reactos.com 28 Apr '05

28 Apr '05

Imported LANG_ and SUBLANG_ defines from WINE Modified: trunk/reactos/include/defines.h _____ Modified: trunk/reactos/include/defines.h --- trunk/reactos/include/defines.h 2005-04-28 13:38:30 UTC (rev 14842) +++ trunk/reactos/include/defines.h 2005-04-28 13:50:32 UTC (rev 14843) @@ -4056,72 +4056,226 @@ #define MDM_V23_OVERRIDE (1024) /* Languages */ -#define LANG_BULGARIAN (2) -#define LANG_CHINESE (4) -#define LANG_CROATIAN (26) -#define LANG_CZECH (5) -#define LANG_DANISH (6) -#define LANG_DUTCH (19) -#define LANG_ENGLISH (9) -#define LANG_FINNISH (11) -#define LANG_FRENCH (12) -#define LANG_GERMAN (7) -#define LANG_GREEK (8) -#define LANG_HUNGARIAN (14) -#define LANG_ICELANDIC (15) -#define LANG_ITALIAN (16) -#define LANG_JAPANESE (17) -#define LANG_KOREAN (18) -#define LANG_NEUTRAL (0) -#define LANG_NORWEGIAN (20) -#define LANG_POLISH (21) -#define LANG_PORTUGUESE (22) -#define LANG_ROMANIAN (24) -#define LANG_RUSSIAN (25) -#define LANG_SLOVAK (27) -#define LANG_SLOVENIAN (36) -#define LANG_SPANISH (10) -#define LANG_SWEDISH (29) -#define LANG_TURKISH (31) -#define SUBLANG_CHINESE_SIMPLIFIED (2) -#define SUBLANG_CHINESE_TRADITIONAL (1) -#define SUBLANG_CHINESE_HONGKONG (3) -#define SUBLANG_CHINESE_SINGAPORE (4) -#define SUBLANG_DEFAULT (1) -#define SUBLANG_DUTCH (1) -#define SUBLANG_DUTCH_BELGIAN (2) -#define SUBLANG_ENGLISH_AUS (3) -#define SUBLANG_ENGLISH_CAN (4) -#define SUBLANG_ENGLISH_EIRE (6) -#define SUBLANG_ENGLISH_NZ (5) -#define SUBLANG_ENGLISH_UK (2) -#define SUBLANG_ENGLISH_US (1) -#define SUBLANG_FRENCH (1) -#define SUBLANG_FRENCH_BELGIAN (2) -#define SUBLANG_FRENCH_CANADIAN (3) -#define SUBLANG_FRENCH_SWISS (4) -#define SUBLANG_GERMAN (1) -#define SUBLANG_GERMAN_AUSTRIAN (3) -#define SUBLANG_GERMAN_SWISS (2) -#define SUBLANG_ITALIAN (1) -#define SUBLANG_ITALIAN_SWISS (2) -#define SUBLANG_NEUTRAL (0) -#define SUBLANG_NORWEGIAN_BOKMAL (1) -#define SUBLANG_NORWEGIAN_NYNORSK (2) -#define SUBLANG_PORTUGUESE (2) -#define SUBLANG_PORTUGUESE_BRAZILIAN (1) -#define SUBLANG_SPANISH (1) -#define SUBLANG_SPANISH_MEXICAN (2) -#define SUBLANG_SPANISH_MODERN (3) -#define SUBLANG_SYS_DEFAULT (2) +#define LANG_NEUTRAL 0x00 +#define LANG_INVARIANT 0x7f + +#define LANG_AFRIKAANS 0x36 +#define LANG_ALBANIAN 0x1c +#define LANG_ARABIC 0x01 +#define LANG_ARMENIAN 0x2b +#define LANG_ASSAMESE 0x4d +#define LANG_AZERI 0x2c +#define LANG_BASQUE 0x2d +#define LANG_BELARUSIAN 0x23 +#define LANG_BENGALI 0x45 +#define LANG_BULGARIAN 0x02 +#define LANG_CATALAN 0x03 +#define LANG_CHINESE 0x04 +#define LANG_CROATIAN 0x1a +#define LANG_CZECH 0x05 +#define LANG_DANISH 0x06 +#define LANG_DIVEHI 0x65 +#define LANG_DUTCH 0x13 +#define LANG_ENGLISH 0x09 +#define LANG_ESTONIAN 0x25 +#define LANG_FAEROESE 0x38 +#define LANG_FARSI 0x29 +#define LANG_FINNISH 0x0b +#define LANG_FRENCH 0x0c +#define LANG_GALICIAN 0x56 +#define LANG_GEORGIAN 0x37 +#define LANG_GERMAN 0x07 +#define LANG_GREEK 0x08 +#define LANG_GUJARATI 0x47 +#define LANG_HEBREW 0x0d +#define LANG_HINDI 0x39 +#define LANG_HUNGARIAN 0x0e +#define LANG_ICELANDIC 0x0f +#define LANG_INDONESIAN 0x21 +#define LANG_ITALIAN 0x10 +#define LANG_JAPANESE 0x11 +#define LANG_KANNADA 0x4b +#define LANG_KASHMIRI 0x60 +#define LANG_KAZAK 0x3f +#define LANG_KONKANI 0x57 +#define LANG_KOREAN 0x12 +#define LANG_KYRGYZ 0x40 +#define LANG_LATVIAN 0x26 +#define LANG_LITHUANIAN 0x27 +#define LANG_MACEDONIAN 0x2f +#define LANG_MALAY 0x3e +#define LANG_MALAYALAM 0x4c +#define LANG_MANIPURI 0x58 +#define LANG_MARATHI 0x4e +#define LANG_MONGOLIAN 0x50 +#define LANG_NEPALI 0x61 +#define LANG_NORWEGIAN 0x14 +#define LANG_ORIYA 0x48 +#define LANG_POLISH 0x15 +#define LANG_PORTUGUESE 0x16 +#define LANG_PUNJABI 0x46 +#define LANG_ROMANIAN 0x18 +#define LANG_RUSSIAN 0x19 +#define LANG_SANSKRIT 0x4f +#define LANG_SERBIAN 0x1a +#define LANG_SINDHI 0x59 +#define LANG_SLOVAK 0x1b +#define LANG_SLOVENIAN 0x24 +#define LANG_SPANISH 0x0a +#define LANG_SWAHILI 0x41 +#define LANG_SWEDISH 0x1d +#define LANG_SYRIAC 0x5a +#define LANG_TAMIL 0x49 +#define LANG_TATAR 0x44 +#define LANG_TELUGU 0x4a +#define LANG_THAI 0x1e +#define LANG_TURKISH 0x1f +#define LANG_UKRAINIAN 0x22 +#define LANG_URDU 0x20 +#define LANG_UZBEK 0x43 +#define LANG_VIETNAMESE 0x2a + +/* FIXME: these are not in the Windows header */ +#define LANG_GAELIC 0x3c +#define LANG_MALTESE 0x3a +#define LANG_MAORI 0x28 +#define LANG_RHAETO_ROMANCE 0x17 +#define LANG_SAAMI 0x3b +#define LANG_SORBIAN 0x2e +#define LANG_SUTU 0x30 +#define LANG_TSONGA 0x31 +#define LANG_TSWANA 0x32 +#define LANG_VENDA 0x33 +#define LANG_XHOSA 0x34 +#define LANG_ZULU 0x35 + +/* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ESPERANTO 0x8f +#define LANG_WALON 0x90 +#define LANG_CORNISH 0x91 +#define LANG_WELSH 0x92 +#define LANG_BRETON 0x93 + +/* Sublanguage definitions */ +#define SUBLANG_NEUTRAL 0x00 /* language neutral */ +#define SUBLANG_DEFAULT 0x01 /* user default */ +#define SUBLANG_SYS_DEFAULT 0x02 /* system default */ + +#define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 +#define SUBLANG_ARABIC_IRAQ 0x02 +#define SUBLANG_ARABIC_EGYPT 0x03 +#define SUBLANG_ARABIC_LIBYA 0x04 +#define SUBLANG_ARABIC_ALGERIA 0x05 +#define SUBLANG_ARABIC_MOROCCO 0x06 +#define SUBLANG_ARABIC_TUNISIA 0x07 +#define SUBLANG_ARABIC_OMAN 0x08 +#define SUBLANG_ARABIC_YEMEN 0x09 +#define SUBLANG_ARABIC_SYRIA 0x0a +#define SUBLANG_ARABIC_JORDAN 0x0b +#define SUBLANG_ARABIC_LEBANON 0x0c +#define SUBLANG_ARABIC_KUWAIT 0x0d +#define SUBLANG_ARABIC_UAE 0x0e +#define SUBLANG_ARABIC_BAHRAIN 0x0f +#define SUBLANG_ARABIC_QATAR 0x10 +#define SUBLANG_AZERI_LATIN 0x01 +#define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_CHINESE_TRADITIONAL 0x01 +#define SUBLANG_CHINESE_SIMPLIFIED 0x02 +#define SUBLANG_CHINESE_HONGKONG 0x03 +#define SUBLANG_CHINESE_SINGAPORE 0x04 +#define SUBLANG_CHINESE_MACAU 0x05 +#define SUBLANG_DUTCH 0x01 +#define SUBLANG_DUTCH_BELGIAN 0x02 +#define SUBLANG_ENGLISH_US 0x01 +#define SUBLANG_ENGLISH_UK 0x02 +#define SUBLANG_ENGLISH_AUS 0x03 +#define SUBLANG_ENGLISH_CAN 0x04 +#define SUBLANG_ENGLISH_NZ 0x05 +#define SUBLANG_ENGLISH_EIRE 0x06 +#define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 +#define SUBLANG_ENGLISH_JAMAICA 0x08 +#define SUBLANG_ENGLISH_CARIBBEAN 0x09 +#define SUBLANG_ENGLISH_BELIZE 0x0a +#define SUBLANG_ENGLISH_TRINIDAD 0x0b +#define SUBLANG_ENGLISH_ZIMBABWE 0x0c +#define SUBLANG_ENGLISH_PHILIPPINES 0x0d +#define SUBLANG_FRENCH 0x01 +#define SUBLANG_FRENCH_BELGIAN 0x02 +#define SUBLANG_FRENCH_CANADIAN 0x03 +#define SUBLANG_FRENCH_SWISS 0x04 +#define SUBLANG_FRENCH_LUXEMBOURG 0x05 +#define SUBLANG_FRENCH_MONACO 0x06 +#define SUBLANG_GERMAN 0x01 +#define SUBLANG_GERMAN_SWISS 0x02 +#define SUBLANG_GERMAN_AUSTRIAN 0x03 +#define SUBLANG_GERMAN_LUXEMBOURG 0x04 +#define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 +#define SUBLANG_ITALIAN 0x01 +#define SUBLANG_ITALIAN_SWISS 0x02 +#define SUBLANG_KASHMIRI_SASIA 0x02 +#define SUBLANG_KASHMIRI_INDIA 0x02 +#define SUBLANG_KOREAN 0x01 +#define SUBLANG_LITHUANIAN 0x01 +#define SUBLANG_MALAY_MALAYSIA 0x01 +#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 +#define SUBLANG_NEPALI_INDIA 0x02 +#define SUBLANG_NORWEGIAN_BOKMAL 0x01 +#define SUBLANG_NORWEGIAN_NYNORSK 0x02 +#define SUBLANG_PORTUGUESE 0x02 +#define SUBLANG_PORTUGUESE_BRAZILIAN 0x01 +#define SUBLANG_SERBIAN_LATIN 0x02 +#define SUBLANG_SERBIAN_CYRILLIC 0x03 +#define SUBLANG_SPANISH 0x01 +#define SUBLANG_SPANISH_MEXICAN 0x02 +#define SUBLANG_SPANISH_MODERN 0x03 +#define SUBLANG_SPANISH_GUATEMALA 0x04 +#define SUBLANG_SPANISH_COSTA_RICA 0x05 +#define SUBLANG_SPANISH_PANAMA 0x06 +#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 +#define SUBLANG_SPANISH_VENEZUELA 0x08 +#define SUBLANG_SPANISH_COLOMBIA 0x09 +#define SUBLANG_SPANISH_PERU 0x0a +#define SUBLANG_SPANISH_ARGENTINA 0x0b +#define SUBLANG_SPANISH_ECUADOR 0x0c +#define SUBLANG_SPANISH_CHILE 0x0d +#define SUBLANG_SPANISH_URUGUAY 0x0e +#define SUBLANG_SPANISH_PARAGUAY 0x0f +#define SUBLANG_SPANISH_BOLIVIA 0x10 +#define SUBLANG_SPANISH_EL_SALVADOR 0x11 +#define SUBLANG_SPANISH_HONDURAS 0x12 +#define SUBLANG_SPANISH_NICARAGUA 0x13 +#define SUBLANG_SPANISH_PUERTO_RICO 0x14 +#define SUBLANG_SWEDISH 0x01 +#define SUBLANG_SWEDISH_FINLAND 0x02 +#define SUBLANG_URDU_PAKISTAN 0x01 +#define SUBLANG_URDU_INDIA 0x02 +#define SUBLANG_UZBEK_LATIN 0x01 +#define SUBLANG_UZBEK_CYRILLIC 0x02 + +/* FIXME: these are not in the Windows header */ +#define SUBLANG_DUTCH_SURINAM 0x03 +#define SUBLANG_ROMANIAN 0x01 +#define SUBLANG_ROMANIAN_MOLDAVIA 0x02 +#define SUBLANG_RUSSIAN 0x01 +#define SUBLANG_RUSSIAN_MOLDAVIA 0x02 +#define SUBLANG_CROATIAN 0x01 +#define SUBLANG_LITHUANIAN_CLASSIC 0x02 +#define SUBLANG_GAELIC 0x01 +#define SUBLANG_GAELIC_SCOTTISH 0x02 +#define SUBLANG_GAELIC_MANX 0x03 + +/* + * Sort definitions + */ +#define SORT_DEFAULT 0x0 +#define SORT_JAPANESE_XJIS 0x0 +#define SORT_JAPANESE_UNICODE 0x1 +#define SORT_CHINESE_BIG5 0x0 +#define SORT_CHINESE_UNICODE 0x1 +#define SORT_KOREAN_KSC 0x0 +#define SORT_KOREAN_UNICODE 0x1 + #define NLS_VALID_LOCALE_MASK (1048575) -#define SORT_DEFAULT (0) -#define SORT_JAPANESE_XJIS (0) -#define SORT_JAPANESE_UNICODE (1) -#define SORT_CHINESE_BIG5 (0) -#define SORT_CHINESE_UNICODE (1) -#define SORT_KOREAN_KSC (0) -#define SORT_KOREAN_UNICODE (1) /* SYSTEM_INFO structure */ #define PROCESSOR_ARCHITECTURE_IA64 (6)

1 0

[greatlrd] 14842: Fix all these waring by initaielize them where they are declare
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

Fix all these waring by initaielize them where they are declare libutil/quad.c: In function `gluPartialDisk': libutil/quad.c:451: warning: 'texLow' might be used uninitialized in this function libutil/quad.c:451: warning: 'texHigh' might be used uninitialized in this function libutil/quad.c: In function `gluSphere': libutil/quad.c:720: warning: 'sintemp2' might be used uninitialized in this function libutil/quad.c:720: warning: 'sintemp3' might be used uninitialized in this function libutil/quad.c:720: warning: 'sintemp4' might be used uninitialized in this function libutil/quad.c:721: warning: 'costemp2' might be used uninitialized in this function libutil/quad.c:721: warning: 'costemp3' might be used uninitialized in this function libutil/quad.c:721: warning: 'costemp4' might be used uninitialized in this function Modified: trunk/reactos/lib/glu32/libutil/quad.c _____ Modified: trunk/reactos/lib/glu32/libutil/quad.c --- trunk/reactos/lib/glu32/libutil/quad.c 2005-04-28 13:19:23 UTC (rev 14841) +++ trunk/reactos/lib/glu32/libutil/quad.c 2005-04-28 13:38:30 UTC (rev 14842) @@ -448,7 +448,7 @@ GLfloat sintemp, costemp; GLfloat deltaRadius; GLfloat radiusLow, radiusHigh; - GLfloat texLow, texHigh; + GLfloat texLow = 0, texHigh = 0; GLfloat angleOffset; GLint slices2; GLint finish; @@ -717,8 +717,8 @@ GLfloat cosCache3b[CACHE_SIZE]; GLfloat angle; GLfloat zLow, zHigh; - GLfloat sintemp1, sintemp2, sintemp3, sintemp4; - GLfloat costemp1, costemp2, costemp3, costemp4; + GLfloat sintemp1, sintemp2=0, sintemp3=0, sintemp4=0; + GLfloat costemp1, costemp2=0, costemp3=0, costemp4=0; GLboolean needCache2, needCache3; GLint start, finish;

1 0

[greatlrd] 14841: fix this waring
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

fix this waring libutil/mipmap.c: In function `gluBuild3DMipmaps': libutil/mipmap.c:7382: warning: 'proxyTarget' might be used uninitialized in this function by initialized the value when it declare Modified: trunk/reactos/lib/glu32/libutil/mipmap.c _____ Modified: trunk/reactos/lib/glu32/libutil/mipmap.c --- trunk/reactos/lib/glu32/libutil/mipmap.c 2005-04-28 13:01:57 UTC (rev 14840) +++ trunk/reactos/lib/glu32/libutil/mipmap.c 2005-04-28 13:19:23 UTC (rev 14841) @@ -7012,7 +7012,7 @@ int groupSize; int rowSize; int padding; - GLubyte *start, *rowStart, *iter; + GLubyte *start, *rowStart, *iter=NULL; int elementsPerLine; const GLushort *iter2; int ii, jj, dd, k; @@ -7367,7 +7367,7 @@ GLint widthPowerOf2= nearestPower(width); GLint heightPowerOf2= nearestPower(height); GLint depthPowerOf2= nearestPower(depth); - GLint proxyWidth; + GLint proxyWidth ; do { /* compute level 1 width & height & depth, clamping each at 1 */ @@ -7380,7 +7380,7 @@ GLint depthAtLevelOne= (depthPowerOf2 > 1) ? depthPowerOf2 >> 1 : depthPowerOf2; - GLenum proxyTarget; + GLenum proxyTarget = 0; assert(widthAtLevelOne > 0); assert(heightAtLevelOne > 0); assert(depthAtLevelOne > 0);

1 0

[greatlrd] 14840: fix waring with insiate iter
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

fix waring with insiate iter libutil/mipmap.c: In function `gluScaleImage': libutil/mipmap.c:5105: warning: 'iter' might be used uninitialized in this function remve outindex it is not being use at all libutil/mipmap.c: In function `scaleInternalPackedPixel': libutil/mipmap.c:5990: warning: 'outindex' might be used uninitialized in this function Modified: trunk/reactos/lib/glu32/libutil/mipmap.c _____ Modified: trunk/reactos/lib/glu32/libutil/mipmap.c --- trunk/reactos/lib/glu32/libutil/mipmap.c 2005-04-28 03:37:01 UTC (rev 14839) +++ trunk/reactos/lib/glu32/libutil/mipmap.c 2005-04-28 13:01:57 UTC (rev 14840) @@ -4862,6 +4862,7 @@ if (padding) { rowsize += psm->unpack_alignment - padding; } + start = (const GLubyte *) userdata + psm->unpack_skip_rows * rowsize + (psm->unpack_skip_pixels * components / 8); elements_per_line = width * components; @@ -5102,7 +5103,7 @@ GLint group_size; GLint elements_per_line; GLubyte *start; - GLubyte *iter; + GLubyte *iter = NULL; const GLushort *iter2; GLint i, j, k; GLint myswap_bytes; @@ -5987,7 +5988,7 @@ int i,j,k,xindex; const char *temp, *temp0; - int outindex; + int outindex = 0; int lowx_int, highx_int, lowy_int, highy_int; float x_percent, y_percent;

1 0

[greatlrd] 14828: remove ddalphablt worng functions
by greatlrd＠svn.reactos.com 26 Apr '05

26 Apr '05

remove ddalphablt worng functions it should have been NtGdiDdAddAlphaBlt Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-04-26 22:02:32 UTC (rev 14827) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-04-26 22:28:24 UTC (rev 14828) @@ -361,13 +361,8 @@ return ddRVal; } -DWORD STDCALL NtGdiDdAlphaBlt(VOID) -{ - // MSDN on all windows 95 to windows xp this call are unsuported - // see Graphics Low Level Client Support - return DDERR_UNSUPPORTED; -} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-04-26 22:02:32 UTC (rev 14827) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-04-26 22:28:24 UTC (rev 14828) @@ -551,4 +551,10 @@ } +DWORD STDCALL NtGdiDdAlphaBlt(VOID) +{ + UNIMPLEMENTED + + return 0; +} /* EOF */

1 0

[greatlrd] 14827: implement NtGdiDdBlt and NtGdiDdAlphaBlt
by greatlrd＠svn.reactos.com 26 Apr '05

26 Apr '05

implement NtGdiDdBlt and NtGdiDdAlphaBlt NtGdiDdAlphaBlt are not supportet by microsoft so we report unsupport directx function Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-04-26 21:26:06 UTC (rev 14826) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-04-26 22:02:32 UTC (rev 14827) @@ -187,6 +187,7 @@ pDirectDraw->DdLockD3DBuffer = puD3dBufferCallbacks->LockD3DBuffer; pDirectDraw->DdUnlockD3DBuffer = puD3dBufferCallbacks->UnlockD3DBuffer; } + GDIOBJ_UnlockObj(hDirectDrawLocal); @@ -286,14 +287,14 @@ DWORD pdwNumFourCC; DWORD *pdwFourCC = NULL; DWORD ddRVal; - - + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - ddRVal = pDirectDraw->DrvGetDirectDrawInfo( + + ddRVal = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev,(PDD_HALINFO) puGetDriverInfoData, &pdwNumHeaps, pvmList, &pdwNumFourCC, pdwFourCC); - + GDIOBJ_UnlockObj(hDirectDrawLocal); return ddRVal; @@ -328,6 +329,8 @@ PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + puCanCreateSurfaceData->lpDD = pDirectDraw->Local.lpGbl; + ddRVal = pDirectDraw->DdCanCreateSurface(puCanCreateSurfaceData); GDIOBJ_UnlockObj(hDirectDrawLocal); @@ -337,5 +340,34 @@ +DWORD STDCALL NtGdiDdBlt( + HANDLE hSurfaceDest, + HANDLE hSurfaceSrc, + PDD_BLTDATA puBltData +) +{ + DWORD ddRVal; + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW); + + puBltData->lpDDDestSurface = hSurfaceDest; + puBltData->lpDDSrcSurface = hSurfaceSrc; + puBltData->lpDD = pDirectDraw->Local.lpGbl; + + ddRVal = pDirectDraw->DdBlt(puBltData); + + GDIOBJ_UnlockObj(hSurfaceDest); + + return ddRVal; +} + +DWORD STDCALL NtGdiDdAlphaBlt(VOID) +{ + // MSDN on all windows 95 to windows xp this call are unsuported + // see Graphics Low Level Client Support + + return DDERR_UNSUPPORTED; +} + + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-04-26 21:26:06 UTC (rev 14826) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-04-26 22:02:32 UTC (rev 14827) @@ -21,8 +21,7 @@ PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData ) { - UNIMPLEMENTED - + UNIMPLEMENTED return 0; } @@ -91,12 +90,7 @@ return 0; } -DWORD STDCALL NtGdiDdAlphaBlt(VOID) -{ - UNIMPLEMENTED - return 0; -} BOOL STDCALL NtGdiDdAttachSurface( HANDLE hSurfaceFrom, @@ -118,17 +112,7 @@ return 0; } -DWORD STDCALL NtGdiDdBlt( - HANDLE hSurfaceDest, - HANDLE hSurfaceSrc, - PDD_BLTDATA puBltData -) -{ - UNIMPLEMENTED - return 0; -} - DWORD STDCALL NtGdiDdCanCreateD3DBuffer( HANDLE hDirectDraw, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData @@ -435,27 +419,7 @@ return 0; } -/* -BOOL STDCALL NtGdiDdQueryDirectDrawObject( - HANDLE hDirectDrawLocal, - DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - PD3DNTHAL_CALLBACKS puD3dCallbacks, - PD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, - VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, - DWORD *puFourCC -) -{ - UNIMPLEMENTED - return 0; -} -*/ - DWORD STDCALL NtGdiDdQueryMoCompStatus( HANDLE hMoComp, PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData

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