Author: dreimer Date: Wed Oct 1 09:14:39 2008 New Revision: 36612
URL: http://svn.reactos.org/svn/reactos?rev=36612&view=rev Log: Sync winfile and write with wine
Added: trunk/rosapps/applications/write/lang/ja-JP.rc (with props) Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/rsrc.rc
Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/j... ============================================================================== --- trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -148,7 +148,7 @@ IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Às" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "R}h(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -162,7 +162,7 @@ IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ú®æðIð" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "pX(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -175,7 +175,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -197,7 +197,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14
Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winefi... ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -201,14 +201,13 @@
/* load resource string */ -static LPTSTR load_string(LPTSTR buffer, UINT id) -{ - LoadString(Globals.hInstance, id, buffer, BUFFER_LEN); - +static LPTSTR load_string(LPTSTR buffer, DWORD size, UINT id) +{ + LoadString(Globals.hInstance, id, buffer, size); return buffer; }
-#define RS(b, i) load_string(b, i) +#define RS(b, i) load_string(b, sizeof(b)/sizeof(b[0]), i)
/* display error message for the specified WIN32 error code */ @@ -1407,9 +1406,9 @@ root->drive_type = DRIVE_UNKNOWN; drv[0] = '\'; drv[1] = '\0'; - load_string(root->volname, IDS_DESKTOP); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_DESKTOP); root->fs_flags = 0; - load_string(root->fs, IDS_SHELL); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_SHELL);
return read_tree_shell(root, pidl, sortOrder, hwnd); } @@ -1422,9 +1421,9 @@ root->drive_type = GetDriveType(path);
lstrcat(drv, sSlash); - load_string(root->volname, IDS_ROOT_FS); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_ROOT_FS); root->fs_flags = 0; - load_string(root->fs, IDS_UNIXFS); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_UNIXFS);
lstrcpy(root->path, sSlash);
@@ -1509,7 +1508,7 @@
#ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) - load_string(root->entry.data.cFileName, IDS_DESKTOP); + load_string(root->entry.data.cFileName, sizeof(root->entry.data.cFileName)/sizeof(root->entry.data.cFileName[0]), IDS_DESKTOP); else #endif wsprintf(root->entry.data.cFileName, RS(b1,IDS_TITLEFMT), drv, root->fs); @@ -3865,7 +3864,7 @@ #endif #ifdef _SHELL_FOLDERS /* insert shell namespace button */ - load_string(b1, IDS_SHELL); + load_string(b1, sizeof(b1)/sizeof(b1[0]), IDS_SHELL); b1[lstrlen(b1)+1] = '\0'; SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1);
@@ -4720,18 +4719,18 @@ /* load column strings */ col = 1;
- load_string(g_pos_names[col++], IDS_COL_NAME); - load_string(g_pos_names[col++], IDS_COL_SIZE); - load_string(g_pos_names[col++], IDS_COL_CDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_NAME); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SIZE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_CDATE); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_ADATE); - load_string(g_pos_names[col++], IDS_COL_MDATE); - load_string(g_pos_names[col++], IDS_COL_IDX); - load_string(g_pos_names[col++], IDS_COL_LINKS); -#endif - load_string(g_pos_names[col++], IDS_COL_ATTR); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ADATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_MDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_IDX); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_LINKS); +#endif + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ATTR); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_SEC); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SEC); #endif }
Added: trunk/rosapps/applications/write/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/ja-... ============================================================================== --- trunk/rosapps/applications/write/lang/ja-JP.rc (added) +++ trunk/rosapps/applications/write/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -1,0 +1,26 @@ +/* + * Japanese language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Wordpad ÌN®É¸sµÜµ½" +}
Propchange: trunk/rosapps/applications/write/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/rosapps/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/rsrc.rc?... ============================================================================== --- trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -27,6 +27,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc"