[dreimer] 43184: Sync xcopy, winhlp32 and wordpad to Wine 1.1.30

Author: dreimer
Date: Sun Sep 27 14:09:18 2009
New Revision: 43184

URL: http://svn.reactos.org/svn/reactos?rev=43184&view=rev
Log:
Sync xcopy, winhlp32 and wordpad to Wine 1.1.30

Added:
    trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc   (with props)
    trunk/reactos/base/applications/winhlp32/Ro.rc   (with props)
Modified:
    trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
    trunk/reactos/base/applications/winhlp32/It.rc
    trunk/reactos/base/applications/winhlp32/rsrc.rc
    trunk/reactos/base/applications/wordpad/print.c
    trunk/reactos/base/applications/wordpad/wordpad.c

Added: trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc (added)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -1,0 +1,84 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Japanese language support
+ *
+ * Copyright (C) 2007 J. Edmeades
+ * Copyright (C) 2009 Akihiro Sagawa
+ *
+ * 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
+ */
+
+#include "xcopy.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "パラメータの数が違います。xcopy /? で使い方を表示します\n"
+    STRING_INVPARM,  "無効なパラメータ '%s' です。xcopy /? で使い方を表示します\n"
+    STRING_PAUSE,    "コピーを開始するには <enter> を押してください\n"
+    STRING_SIMCOPY,  "%d ファイルがコピーされる見込みです。\n"
+    STRING_COPY,     "%d ファイルをコピーしました\n"
+    STRING_QISDIR,   "送り先の '%s' はファイル名ですか、\n" \
+                     "ディレクトリですか?\n" \
+                     "(F - ファイル、D - ディレクトリ)\n"
+    STRING_SRCPROMPT,"%s? (Yes|No)\n"
+    STRING_OVERWRITE,"%s を上書きしますか? (Yes|No|All)\n"
+    STRING_COPYFAIL, "'%s' から '%s' へのコピーは失敗しました。戻り値 %d\n"
+    STRING_OPENFAIL, "'%s' を開けません\n"
+    STRING_READFAIL, "'%s' の読み込み中に失敗しました\n"
+    STRING_YES_CHAR, "Y"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "A"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "D"
+
+    STRING_HELP,
+"XCOPY - 送り元のファイルやディレクトリを送り先にコピーします\n\
+\n\
+構文:\n\
+XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+オプション:\n\
+\n\
+[/I]  送り先が存在せず、複数のファイルをコピーするときは、送り先を\n\
+\tディレクトリとみなします。\n\
+[/S]  ディレクトリとサブディレクトリをコピーします。\n\
+[/E]  空ディレクトリを含め、ディレクトリとサブディレクトリをコピー。\n\
+[/Q]  コピー中にファイル名を一覧にしません。すなわち寡黙です。\n\
+[/F]  コピー中にフルパスで送り元と送り先の名前を表示します。\n\
+[/L]  操作を模擬実行し、コピー予定のファイル名を表示します。\n\
+[/W]  コピーを開始する前に確認のメッセージを表示します。\n\
+[/T]  ç©ºã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæ§‹é€ ã‚’ä½œæˆã—ã¾ã™ãŒã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚³ãƒ”ãƒ¼ã—ã¾ã›ã‚“ã€‚\n\
+[/Y]  ファイルを上書きする時に確認のメッセージを表示しません。\n\
+[/-Y] ファイルを上書きする時に確認のメッセージを表示します。\n\
+[/P]  各ファイルのコピー前に確認のメッセージを表示します。\n\
+[/N]  短いファイル名を利用してコピーします。\n\
+[/U]  送り先にあるファイルだけコピーします。\n\
+[/R]  読み取り専用ファイルを上書きします。\n\
+[/H]  éš ã—ãƒ•ã‚¡ã‚¤ãƒ«ã‚„ã‚·ã‚¹ãƒ†ãƒ  ファイルもコピーします。\n\
+[/C]  コピー中にエラーが起こっても続行します。\n\
+[/A]  アーカイブ属性のファイルだけコピーします。\n\
+[/M]  アーカイブ属性のファイルだけコピーし、アーカイブ属性を\n\
+\t取り除きます。\n\
+[/D | /D:月-日-年] 新しいファイルや指定された日付以降に変更された\n\
+\t\tãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚³ãƒ”ãƒ¼ã—ã¾ã™ã€‚æ—¥ä»˜ãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã¯ã€\n\
+\t\tコピー先がコピー元より古いファイルだけコピーします。\n\n"
+
+}
+#pragma code_page(default)

Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -30,6 +30,7 @@
 #include "De.rc"
 #include "En.rc"
 #include "Fr.rc"
+#include "Ja.rc"
 #include "Ko.rc"
 #include "Lt.rc"
 #include "Nl.rc"

Modified: trunk/reactos/base/applications/winhlp32/It.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/...
==============================================================================
--- trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -31,7 +31,7 @@
   MENUITEM "&Apri...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "S&tampa", MNID_FILE_PRINT
-  MENUITEM "&Setup stampante...", MNID_FILE_SETUP
+  MENUITEM "&Installazione stampante...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Esci", MNID_FILE_EXIT
  }

Added: trunk/reactos/base/applications/winhlp32/Ro.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/...
==============================================================================
--- trunk/reactos/base/applications/winhlp32/Ro.rc (added)
+++ trunk/reactos/base/applications/winhlp32/Ro.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -1,0 +1,133 @@
+/*
+ * Help Viewer
+ *
+ * Copyright 1996 Ulrich Schmid
+ * Copyright 2002 Sylvain Petreolle [e-mail]
+ * Copyright 2009 Michael Stefaniuc
+ *
+ * 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
+ */
+
+#include "winhelp_res.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+/* Menu */
+
+MAIN_MENU MENU
+{
+ POPUP "&Fișier" {
+  MENUITEM "&Deschide",                      MNID_FILE_OPEN
+  MENUITEM SEPARATOR
+  MENUITEM "&Tipărește",                     MNID_FILE_PRINT
+  MENUITEM "&Setare imprimantă",             MNID_FILE_SETUP
+  MENUITEM SEPARATOR
+  MENUITEM "&Ieșire",                        MNID_FILE_EXIT
+ }
+ POPUP "&Editare" {
+   MENUITEM "&Copiază...",                   MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "&Adnotează...",                 MNID_EDIT_ANNOTATE
+ }
+ POPUP "&Se&mn de carte" {
+   MENUITEM "&Definește...",                 MNID_BKMK_DEFINE
+ }
+ POPUP "&Opțiuni" {
+   POPUP "&Ajutor întotdeauna vizibil"
+   BEGIN
+     MENUITEM "Implicit",                    MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Vizibil",                     MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Invizibil",                   MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "Istorie",                        MNID_OPTS_HISTORY
+  POPUP    "&Font"
+  BEGIN
+    MENUITEM "Mic",                          MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",                       MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Mare",                         MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Utilizează culorile sistemului", MNID_OPTS_SYSTEM_COLORS
+ }
+ POPUP "&Ajutor" {
+   MENUITEM "Ajut&or despre ajutor",         MNID_HELP_HELPON
+   MENUITEM "În&totdeauna deasupra",         MNID_HELP_HELPTOP
+   MENUITEM SEPARATOR
+   MENUITEM "&Informații...",                MNID_HELP_ABOUT
+#ifdef WINELIB
+   MENUITEM "&Despre Wine",                  MNID_HELP_WINE
+#endif
+ }
+}
+
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Index"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+}
+
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Căutare"
+{
+    LTEXT  "Încă neimplementată", -1, 10, 10, 180, 150
+}
+
+/* Strings */
+STRINGTABLE DISCARDABLE
+{
+STID_WINE_HELP,         "Ajutor Wine"
+STID_WHERROR,           "EROARE"
+STID_WARNING,           "AVERTISMENT"
+STID_INFO,              "Informație"
+STID_NOT_IMPLEMENTED,   "Neimplementat"
+STID_HLPFILE_ERROR_s,   "Eroare la citirea fișierului de ajutor „%s”"
+STID_INDEX,             "&Index"
+STID_CONTENTS,          "Rezumat"
+STID_BACK,              "În&apoi"
+STID_ALL_FILES,         "Toate fișierele (*.*)"
+STID_HELP_FILES_HLP,    "Fișierele de ajutor (*.hlp)"
+STID_FILE_NOT_FOUND_s   "Fișierul „%s” nu poate fi găsit. Vreți să-l cautați?"
+STID_NO_RICHEDIT        "Nu am găsit o implementare pentru richedit... Abandonez"
+STID_PSH_INDEX,         "Subiecte de ajutor:"
+}
+
+CONTEXT_MENU MENU
+BEGIN
+  POPUP ""
+  BEGIN
+    MENUITEM "Adnotare...",                    MNID_CTXT_ANNOTATE
+    MENUITEM "Copiază",                        MNID_CTXT_COPY
+    MENUITEM "Tipărește...",                   MNID_CTXT_PRINT
+    POPUP "Fonturi"
+    BEGIN
+      MENUITEM "Mic",                          MNID_CTXT_FONTS_SMALL
+      MENUITEM "Normal",                       MNID_CTXT_FONTS_NORMAL
+      MENUITEM "Mare",                         MNID_CTXT_FONTS_LARGE
+    END
+    POPUP "Ajutorul întotdeauna vizibil"
+    BEGIN
+      MENUITEM "Implicit",                     MNID_CTXT_HELP_DEFAULT
+      MENUITEM "Vizibil",                      MNID_CTXT_HELP_VISIBLE
+      MENUITEM "Invizibil",                    MNID_CTXT_HELP_NONVISIBLE
+    END
+    MENUITEM "Utilizează culorile sistemului", MNID_CTXT_SYSTEM_COLORS
+  END
+END
+#pragma code_page(default)

Propchange: trunk/reactos/base/applications/winhlp32/Ro.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/...
==============================================================================
--- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -42,6 +42,7 @@
 #include "Pl.rc"
 #include "Pt.rc"
 #include "Rm.rc"
+#include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
 #include "Sk.rc"

Modified: trunk/reactos/base/applications/wordpad/print.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/p...
==============================================================================
--- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -97,7 +97,7 @@
                             WS_VISIBLE | WS_CHILD, 5, 5, 100, 15,
                             hRebarWnd, ULongToHandle(command), hInstance, NULL);

-    rb.cbSize = sizeof(rb);
+    rb.cbSize = REBARBANDINFOW_V6_SIZE;
     rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID;
     rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT;
     rb.hwndChild = hButton;
@@ -448,7 +448,7 @@
                                 WS_VISIBLE | WS_CHILD, 0, 0, 0, 0,
                                 hReBar, NULL, NULL, NULL);

-        rb.cbSize = sizeof(rb);
+        rb.cbSize = REBARBANDINFOW_V6_SIZE;
         rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID;
         rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT;
         rb.hwndChild = hStatic;

Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/w...
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sun Sep 27 14:09:18 2009
@@ -644,7 +644,7 @@
         REBARBANDINFOW rbbinfo;
         int index = SendMessageW(hwndReBar, RB_IDTOINDEX, BANDID_FONTLIST, 0);

-        rbbinfo.cbSize = sizeof(rbbinfo);
+        rbbinfo.cbSize = REBARBANDINFOW_V6_SIZE;
         rbbinfo.fMask = RBBIM_STYLE;

SendMessageW(hwndReBar, RB_GETBANDINFO, index, (LPARAM)&rbbinfo);
@@ -1795,7 +1795,7 @@

SendMessageW(hToolBarWnd, TB_AUTOSIZE, 0, 0);

-    rbb.cbSize = sizeof(rbb);
+    rbb.cbSize = REBARBANDINFOW_V6_SIZE;
     rbb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_STYLE | RBBIM_ID;
     rbb.fStyle = RBBS_CHILDEDGE | RBBS_BREAK | RBBS_NOGRIPPER;
     rbb.cx = 0;