Sync reg, xcopy, iexplore, winhlp32, wordpad, write, msiexec with Wine 1.3 RC3

svn path=/trunk/; revision=47776

reactos/base/applications/cmdutils/reg/Da.rc

@@ -3,6 +3,7 @@
  * Danish language support
  *
  * Copyright 2008 Jens Albretsen <jens@albretsen.dk>
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,12 +22,19 @@
 
 #include "reg.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
     STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n"
-    STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n"
+    STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n"
+    STRING_SUCCESS, "Operationen blev afsluttet med succes\n"
+    STRING_INVALID_KEY, "Fejl: Ugyldigt nøgle navn\n"
+    STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n"
+    STRING_NO_REMOTE, "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n"
+    STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nøgle eller værdi\n"
 }

reactos/base/applications/cmdutils/reg/Es.rc

@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * Spanish language support
+ *
+ * Copyright 2010 José Rostagno
+ *
+ * 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 "reg.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n"
+    STRING_SUCCESS, "La operación finalizó con éxito\n"
+    STRING_INVALID_KEY, "Error: nombre de clave no válido\n"
+    STRING_INVALID_CMDLINE, "Error: parámetros de línea de comandos inválidos\n"
+    STRING_NO_REMOTE, "Error: No se puede agregar claves al equipo remoto\n"
+    STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n"
+}

reactos/base/applications/cmdutils/reg/Nl.rc

@@ -30,8 +30,8 @@ STRINGTABLE
     STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n"
     STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n"
     STRING_SUCCESS, "De bewerking is succesvol voltooid\n"
-    STRING_INVALID_KEY, "Fout: Foutieve sleutel naam\n"
+    STRING_INVALID_KEY, "Fout: Foutieve sleutelnaam\n"
-    STRING_INVALID_CMDLINE, "Fout: Foutieve commando regel parameters\n"
+    STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n"
     STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n"
-    STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registry sleutel of waarde niet vinden\n"
+    STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n"
 }

reactos/base/applications/cmdutils/reg/Pl.rc

@@ -4,6 +4,7 @@
  *
  * Copyright 2008 Andrew Riedi
  * Copyright 2008 Mikolaj Zalewski
+ * Copyright 2010 Łukasz Wojniłowicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,4 +31,9 @@ STRINGTABLE
     STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartoœci | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
     STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartoœci | /ve | /va] [/f]\n"
     STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartoœci | /ve] [/s]\n"
+    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
+    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
+    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
+    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
+    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
 }

reactos/base/applications/cmdutils/reg/rsrc.rc

@@ -1,11 +1,12 @@
-#include "Da.rc"
 #include "En.rc"
 #include "Ko.rc"
 #include "Nl.rc"
 #include "Pl.rc"
 
 /* UTF-8 */
+#include "Da.rc"
 #include "De.rc"
+#include "Es.rc"
 #include "Fr.rc"
 #include "It.rc"
 #include "Ja.rc"

reactos/base/applications/cmdutils/xcopy/Nl.rc

@@ -29,15 +29,15 @@ STRINGTABLE
 {
     STRING_INVPARMS, "Onjuist aantal parameters - Gebruik xcopy /? om hulp te krijgen\n"
     STRING_INVPARM,  "Onjuiste parameter '%s' -  Gebruik xcopy /? om hulp te krijgen\n"
-    STRING_PAUSE,    "Druk op <enter> om te beginnen met copiëren\n"
+    STRING_PAUSE,    "Druk op <enter> om te beginnen met kopiëren\n"
-    STRING_SIMCOPY,  "%d bestand(en) zouden worden gecopiëerd\n"
+    STRING_SIMCOPY,  "%d bestand(en) zouden worden gekopieerd\n"
-    STRING_COPY,     "%d bestand(en) gecopiëerd\n"
+    STRING_COPY,     "%d bestand(en) gekopieerd\n"
-    STRING_QISDIR,   "Is '%s' een bestand of een directory\n" \
+    STRING_QISDIR,   "Is '%s' een bestand of een map\n" \
                      "op de bestemming?\n" \
                      "(B - Bestand, D - Directory)\n"
     STRING_SRCPROMPT,"%s? (Ja|Nee)\n"
     STRING_OVERWRITE,"Overschrijven %s? (Ja|Nee|Alles)\n"
-    STRING_COPYFAIL, "Copiëren van '%s' naar '%s' mislukt met r/c %d\n"
+    STRING_COPYFAIL, "Kopiëren van '%s' naar '%s' mislukt met r/c %d\n"
     STRING_OPENFAIL, "Fout tijdens openen van '%s'\n"
     STRING_READFAIL, "Fout tijdens lezen van '%s'\n"
     STRING_YES_CHAR, "J"
@@ -47,7 +47,7 @@ STRINGTABLE
     STRING_DIR_CHAR, "D"
 
     STRING_HELP,
-"XCOPY - Copiëerd bron bestanden of directory bomen naar een bestemming\n\
+"XCOPY - Kopieert bronbestanden of -mappen naar een bestemming\n\
 \n\
 Gebruik:\n\
 XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
@@ -56,26 +56,26 @@ XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 Parameters:\n\
 \n\
 [/I]  Als bestemming niet bestaat en 2 of meer bestanden worden\n\
-\tgecopiëerd, neem aan dat een directory werd bedoeld\n\
+\tgekopieerd, neem aan dat een map werd bedoeld\n\
-[/S]  Copiëer directories en subdirectories\n\
+[/S]  Kopieer mappen en submappen\n\
-[/E]  Copiëer directories en subdirectories, inclusief lege\n\
+[/E]  Kopieer mappen en submappen, inclusief lege\n\
-[/Q]  Toon geen namen tijdens copiëren (stil).\n\
+[/Q]  Toon geen namen tijdens kopiëren (stil).\n\
-[/F]  Toon volledige bron- en bestemmingnamen tijdens copiëren\n\
+[/F]  Toon volledige bron- en bestemmingnamen tijdens kopiëren\n\
-[/L]  Simuleer de actie, toon de namen die gecopiëerd zouden worden\n\
+[/L]  Simuleer de actie, toon de namen die gekopieerd zouden worden\n\
-[/W]  Wacht op gebruiker actie voordat de copiëeractie begint\n\
+[/W]  Wacht op actie van de gebruiker voor het kopiëren begint\n\
-[/T]  Creëert de lege directory structuur maar copiëert geen bestanden\n\
+[/T]  Creëert een lege mapstructuur, maar kopieert geen bestanden\n\
 [/Y]  Onderdrukt gebruikersactie wanneer bestanden worden overschreven\n\
 [/-Y] Vraagt gebruikersactie wanneer bestanden worden overschreven\n\
-[/P]  Vraagt gebruikersactie voor ieder bron bestand voor copiëren\n\
+[/P]  Vraagt gebruikersactie voor ieder bronbestand voor kopiëren\n\
-[/N]  Copiëer m.b.v korte bestandsnamen\n\
+[/N]  Kopieer m.b.v korte bestandsnamen\n\
-[/U]  Copiëer alleen bestanden die al bestaan op de bestemming\n\
+[/U]  Kopieer alleen bestanden die al bestaan op de bestemming\n\
 [/R]  Overschrijf alle schrijf-beveiligde bestanden\n\
 [/H]  Inclusief verborgen en systeem bestanden\n\
-[/C]  Ga door zelfs als er een fout optreed tijdens het copiëren\n\
+[/C]  Ga door zelfs als er een fout optreed tijdens het kopiëren\n\
-[/A]  Copiëer alleen bestanden met archiverings attribuut aan\n\
+[/A]  Kopieer alleen bestanden met archiveringsattribuut aan\n\
-[/M]  Copiëer alleen bestanden met archiverings attribuut aan, verwijderd\n\
+[/M]  Kopieer alleen bestanden met archiveringsattribuut aan, verwijdert\n\
-\tdit archiverings attribuut\n\
+\tdit archiveringsattribuut\n\
-[/D | /D:m-d-y] Copiëer nieuwe bestanden of die gewijzigd zijn na de opgegeven\n\
+[/D | /D:m-d-y] Kopieer bestanden die nieuw zijn of gewijzigd zijn na de opgegeven\n\
-\t\tdatum. Als geen detum wordt gegeven, copiëer alleen als bron nieuwer is.\n\n"
+\t\tdatum. Als geen datum wordt gegeven, kopieer alleen als bron nieuwer is.\n\n"
 
 }

reactos/base/applications/cmdutils/xcopy/xcopy.c

@@ -261,11 +261,13 @@ int wmain (int argc, WCHAR *argvW[])
     WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination));
 
     /* Extract required information from source specification */
-    XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags);
+    rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags);
+    if (rc != RC_OK) return rc;
 
     /* Extract required information from destination specification */
-    XCOPY_ProcessDestParm(supplieddestination, destinationstem,
+    rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem,
                                destinationspec, sourcespec, flags);
+    if (rc != RC_OK) return rc;
 
     /* Trace out the resulting information */
     WINE_TRACE("Resolved parameters:\n");

reactos/base/applications/iexplore/iexplore.rbuild

@@ -6,5 +6,5 @@
 	<library>gdi32</library>
 	<library>shdocvw</library>
 	<file>main.c</file>
-	<file>version.rc</file>
+	<file>iexplore.rc</file>
 </module>

reactos/base/applications/iexplore/iexplore.rc

@@ -25,3 +25,6 @@
 #define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
 
 #include "wine/wine_common_ver.rc"
+
+/* @makedep: iexplore.ico */
+1 ICON iexplore.ico

reactos/base/applications/winhlp32/Da.rc

@@ -4,6 +4,7 @@
  * Copyright 1997 Henrik Olsen
  * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
  * Copyright 2008 Jens Albretsen<jens@albretsen.dk>
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,12 +23,16 @@
 
 #include "winhelp_res.h"
 
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Filer" {
-  MENUITEM "Å&ben...", MNID_FILE_OPEN
+  MENUITEM "Å&ben...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Udskriv emne", MNID_FILE_PRINT
   MENUITEM "&Indstil printer", MNID_FILE_SETUP
@@ -37,9 +42,9 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
  POPUP "&Rediger" {
    MENUITEM "K&opier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Anmærk...", MNID_EDIT_ANNOTATE
+   MENUITEM "&Anmærk...", MNID_EDIT_ANNOTATE
  }
- POPUP "Bog&mærke" {
+ POPUP "Bog&mærke" {
    MENUITEM "&Definer...", MNID_BKMK_DEFINE
  }
  POPUP "&Options" {
@@ -58,18 +63,18 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
   END
   MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
  }
- POPUP "&Hjælp" {
+ POPUP "&Hjælp" {
-   MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON
+   MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON
-   MENUITEM "Altid &øverst", MNID_HELP_HELPTOP
+   MENUITEM "Altid &øverst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
    MENUITEM "&Information...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "Om &WINE", MNID_HELP_WINE
+   MENUITEM "Om &Wine", MNID_HELP_WINE
 #endif
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -77,21 +82,52 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-/* Strings */
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Søg"
 {
-STID_WINE_HELP, 	"WINE Hjælp"
+    LTEXT  "Er ikke blevet implementeret endnu", -1, 10, 10, 180, 150
+}
+
+/* Strings */
+STRINGTABLE DISCARDABLE
+{
+STID_WINE_HELP, 	"Wine Hjælp"
 STID_WHERROR, 		"FEJL"
 STID_WARNING,  		"ADVARSEL"
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Ikke implementeret"
-STID_HLPFILE_ERROR_s, 	"Fejl ved indlæsning af filen `%s'"
+STID_HLPFILE_ERROR_s, 	"Fejl ved indlæsning af filen `%s'"
 STID_INDEX, 		"&Indhold"
 STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Tilbage"
 STID_ALL_FILES, 	"Alle filer (*.*)"
-STID_HELP_FILES_HLP, 	"Hjælpe filer (*.hlp)"
+STID_HELP_FILES_HLP, 	"Hjælpe filer (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan ikke finde '%s'. Vil du selv finde filen?"
 STID_NO_RICHEDIT	"Kan ikke finde en 'richedit' implementering... Afbryder"
 STID_PSH_INDEX,		"Help topics: "
 }
+
+CONTEXT_MENU MENU
+BEGIN
+        POPUP ""
+        BEGIN
+                MENUITEM "Notat...",           MNID_CTXT_ANNOTATE
+                MENUITEM "Kopier",             MNID_CTXT_COPY
+                MENUITEM "Udskriv...",         MNID_CTXT_PRINT
+                POPUP    "Skrifttype"
+                BEGIN
+                        MENUITEM "Lille",      MNID_CTXT_FONTS_SMALL
+                        MENUITEM "Normal",     MNID_CTXT_FONTS_NORMAL
+                        MENUITEM "Stor",       MNID_CTXT_FONTS_LARGE
+                END
+                POPUP   "Bevar Hjælp øverst"
+                BEGIN
+                        MENUITEM "Standard",   MNID_CTXT_HELP_DEFAULT
+                        MENUITEM "Synlig",     MNID_CTXT_HELP_VISIBLE
+                        MENUITEM "Usynlig",    MNID_CTXT_HELP_NONVISIBLE
+                END
+                MENUITEM "Benyt systemfarver", MNID_CTXT_SYSTEM_COLORS
+        END
+END

reactos/base/applications/winhlp32/It.rc

@@ -59,7 +59,7 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
   END
   MENUITEM "Usa colori di sistema",	MNID_OPTS_SYSTEM_COLORS
  }
- POPUP "&?" {
+ POPUP "&Aiuto" {
    MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON
    MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -70,8 +70,23 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
  }
 }
 
-/* Strings */
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Indice"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+}
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Cerca"
+{
+    LTEXT  "Non implementato.", -1, 10, 10, 180, 150
+}
+
+/* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 {
 STID_WINE_HELP, 	"Guida di WINE"
@@ -89,3 +104,26 @@ STID_FILE_NOT_FOUND_s	"Non è stato possibile trovare '%s'. Vuoi cercare questo
 STID_NO_RICHEDIT	"Non è stato possibile trovare un'implementazione richedit... Annullando"
 STID_PSH_INDEX,		"Argomenti di aiuto: "
 }
+
+CONTEXT_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Annotazione...",       MNID_CTXT_ANNOTATE
+        MENUITEM "Copia",                MNID_CTXT_COPY
+        MENUITEM "Stampa...",            MNID_CTXT_PRINT
+        POPUP    "Caratteri"
+        BEGIN
+            MENUITEM "Piccolo",       MNID_CTXT_FONTS_SMALL
+            MENUITEM "Normale",      MNID_CTXT_FONTS_NORMAL
+            MENUITEM "Grande",       MNID_CTXT_FONTS_LARGE
+        END
+        POPUP   "Aiuto sempre visibile"
+        BEGIN
+            MENUITEM "Default",     MNID_CTXT_HELP_DEFAULT
+            MENUITEM "Visibile",     MNID_CTXT_HELP_VISIBLE
+            MENUITEM "Non visibile", MNID_CTXT_HELP_NONVISIBLE
+        END
+        MENUITEM "Usa i colori di sistema",   MNID_CTXT_SYSTEM_COLORS
+    END
+END

reactos/base/applications/winhlp32/Nl.rc

@@ -23,15 +23,17 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Bestand" {
   MENUITEM "&Openen", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Af&drukken", MNID_FILE_PRINT
-  MENUITEM "&Printerinstellingen...", MNID_FILE_SETUP
+  MENUITEM "&Pagina-instellingen...", MNID_FILE_SETUP
   MENUITEM SEPARATOR
   MENUITEM "&Afsluiten", MNID_FILE_EXIT
  }
@@ -50,7 +52,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
      MENUITEM "Zichtbaar",	MNID_OPTS_HELP_VISIBLE
      MENUITEM "Niet zichtbaar",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "Historie",		MNID_OPTS_HISTORY
+  MENUITEM "Geschiedenis",		MNID_OPTS_HISTORY
   POPUP    "Lettertype"
   BEGIN
     MENUITEM "Klein",		MNID_OPTS_FONTS_SMALL
@@ -70,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -78,7 +80,7 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Zoeken"
@@ -87,7 +89,7 @@ CAPTION "Zoeken"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Wine Help"
 STID_WHERROR, 		"FOUT"
@@ -102,17 +104,17 @@ STID_ALL_FILES, 	"Alle bestanden (*.*)"
 STID_HELP_FILES_HLP, 	"Helpbestanden (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?"
 STID_NO_RICHEDIT	"Kan geen richedit implementatie vinden... Actie afgebroken"
-STID_PSH_INDEX,		"Help onderwerpen: "
+STID_PSH_INDEX,		"Help-onderwerpen: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN
 		MENUITEM "Annotering...",       MNID_CTXT_ANNOTATE
 		MENUITEM "Kopiëren",            MNID_CTXT_COPY
-		MENUITEM "Print...",            MNID_CTXT_PRINT
+		MENUITEM "Afdrukken ...",       MNID_CTXT_PRINT
-		POPUP    "Lettertypes"
+		POPUP    "Lettertype"
 		BEGIN
 			MENUITEM "Klein",       MNID_CTXT_FONTS_SMALL
 			MENUITEM "Normaal",     MNID_CTXT_FONTS_NORMAL
@@ -124,6 +126,6 @@ BEGIN
 			MENUITEM "Zichtbaar",   MNID_CTXT_HELP_VISIBLE
 			MENUITEM "Onzichtbaar", MNID_CTXT_HELP_NONVISIBLE
 		END
-		MENUITEM "Gebruik systeem kleuren",   MNID_CTXT_SYSTEM_COLORS
+		MENUITEM "Gebruik systeemkleuren",   MNID_CTXT_SYSTEM_COLORS
 	END
 END

reactos/base/applications/winhlp32/Uk.rc

@@ -0,0 +1,202 @@
+/*
+ * Help Viewer
+ *
+ * Copyright 1996 Ulrich Schmid
+ * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
+ *
+ * Ukrainian language support
+ *
+ * Copyright (C) 2010 Igor Paliychuk
+ *
+ * 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"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+/* Menu */
+
+MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+{
+ POPUP "&Файл" {
+  MENUITEM "&Відкрити", MNID_FILE_OPEN
+  MENUITEM SEPARATOR
+  MENUITEM "&Друк", MNID_FILE_PRINT
+  MENUITEM "Налаштування &принтера...", MNID_FILE_SETUP
+   MENUITEM SEPARATOR
+  MENUITEM "В&ихід", MNID_FILE_EXIT
+ }
+ POPUP "&Правка" {
+   MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
+ }
+ POPUP "&Закладка" {
+   MENUITEM "&Define...", MNID_BKMK_DEFINE
+ }
+ POPUP "&Налаштування" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "За замовчуванням",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Видимий",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Невидимий",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "Історія",		MNID_OPTS_HISTORY
+  POPUP    "Шрифти"
+  BEGIN
+    MENUITEM "Малий",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Нормальний",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Великий",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Використати системні кольори",	MNID_OPTS_SYSTEM_COLORS
+ }
+ POPUP "&Довідка" {
+   MENUITEM "Help &on help", MNID_HELP_HELPON
+   MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP
+   MENUITEM SEPARATOR
+   MENUITEM "&Інформація...", MNID_HELP_ABOUT
+#ifdef WINELIB
+   MENUITEM "&Про Wine", MNID_HELP_WINE
+#endif
+ }
+}
+
+MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL
+{
+ POPUP "&Файл" {
+  MENUITEM "&Відкрити", MNID_FILE_OPEN
+  MENUITEM SEPARATOR
+  MENUITEM "&Друк", MNID_FILE_PRINT
+  MENUITEM "Налаштування &принтера...", MNID_FILE_SETUP
+   MENUITEM SEPARATOR
+  MENUITEM "В&ихід", MNID_FILE_EXIT
+ }
+ POPUP "&Правка" {
+   MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
+ }
+ POPUP "&Закладка" {
+   MENUITEM "&Define...", MNID_BKMK_DEFINE
+ }
+ POPUP "&Налаштування" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "За замовчуванням",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Видимий",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Невидимий",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "Історія",		MNID_OPTS_HISTORY
+  POPUP    "Шрифти"
+  BEGIN
+    MENUITEM "Малий",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Нормальний",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Великий",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Використати системні кольори",	MNID_OPTS_SYSTEM_COLORS
+ }
+ POPUP "&Довідка" {
+   MENUITEM "Help &on help", MNID_HELP_HELPON
+   MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP
+   MENUITEM SEPARATOR
+   MENUITEM "&Інформація...", MNID_HELP_ABOUT
+#ifdef WINELIB
+   MENUITEM "&Про Wine", MNID_HELP_WINE
+#endif
+ }
+}
+
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+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 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Search"
+{
+    LTEXT  "Ще не впроваджено", -1, 10, 10, 180, 150
+}
+
+/* Strings */
+STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+{
+STID_WINE_HELP, 	"Довідка Wine"
+STID_WHERROR, 		"ПОМИЛКА"
+STID_WARNING,  		"УВАГА"
+STID_INFO,  		"Інформація"
+STID_NOT_IMPLEMENTED, 	"Не впроваджено"
+STID_HLPFILE_ERROR_s, 	"Помилка читання файлу довідки `%s'"
+STID_INDEX, 		"&Index"
+STID_CONTENTS,		"Summary"
+STID_BACK, 		"&Назад"
+STID_ALL_FILES, 	"Всі файли (*.*)"
+STID_HELP_FILES_HLP, 	"Файли довідки (*.hlp)"
+STID_FILE_NOT_FOUND_s	"Не можу знайти '%s'. Хочете знайти цей файл самотужки?"
+STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Розділи Довідки: "
+}
+
+CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+BEGIN
+	POPUP ""
+	BEGIN
+		MENUITEM "Annotation...",       MNID_CTXT_ANNOTATE
+		MENUITEM "Копіювати",                MNID_CTXT_COPY
+		MENUITEM "Друк...",            MNID_CTXT_PRINT
+		POPUP    "Шрифти"
+		BEGIN
+			MENUITEM "Малий",       MNID_CTXT_FONTS_SMALL
+			MENUITEM "Нормальний",      MNID_CTXT_FONTS_NORMAL
+			MENUITEM "Великий",       MNID_CTXT_FONTS_LARGE
+		END
+		POPUP   "Довідка завжди видима"
+		BEGIN
+			MENUITEM "За замовчуванням",     MNID_CTXT_HELP_DEFAULT
+			MENUITEM "Видима",     MNID_CTXT_HELP_VISIBLE
+			MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE
+		END
+		MENUITEM "Використати системні кольори",   MNID_CTXT_SYSTEM_COLORS
+	END
+END
+
+CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL
+BEGIN
+	POPUP ""
+	BEGIN
+		MENUITEM "Annotation...",       MNID_CTXT_ANNOTATE
+		MENUITEM "Копіювати",                MNID_CTXT_COPY
+		MENUITEM "Друк...",            MNID_CTXT_PRINT
+		POPUP    "Шрифти"
+		BEGIN
+			MENUITEM "Малий",       MNID_CTXT_FONTS_SMALL
+			MENUITEM "Нормальний",      MNID_CTXT_FONTS_NORMAL
+			MENUITEM "Великий",       MNID_CTXT_FONTS_LARGE
+		END
+		POPUP   "Довідка завжди видима"
+		BEGIN
+			MENUITEM "За замовчуванням",     MNID_CTXT_HELP_DEFAULT
+			MENUITEM "Видима",     MNID_CTXT_HELP_VISIBLE
+			MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE
+		END
+		MENUITEM "Використати ситемні кольори",   MNID_CTXT_SYSTEM_COLORS
+	END
+END

reactos/base/applications/winhlp32/hlpfile.c

@@ -815,6 +815,34 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file,
                                   file->lpszPath, -1, HLPFILE_Hash(str),
                                   0, 1, -1);
             break;
+
+        case 0xEE:
+        case 0xEF:
+            {
+                const char* win = strchr(str, '>');
+                int wnd = -1;
+                char* tgt = NULL;
+
+                if (win)
+                {
+                    for (wnd = file->numWindows - 1; wnd >= 0; wnd--)
+                    {
+                        if (!strcmp(win + 1, file->windows[wnd].name)) break;
+                    }
+                    if (wnd == -1)
+                        WINE_WARN("Couldn't find window info for %s\n", win);
+                    if ((tgt = HeapAlloc(GetProcessHeap(), 0, win - str + 1)))
+                    {
+                        memcpy(tgt, str, win - str);
+                        tgt[win - str] = '\0';
+                    }
+                }
+                hslink = (HLPFILE_HOTSPOTLINK*)
+                    HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup,
+                                      file->lpszPath, -1, HLPFILE_Hash(tgt ? tgt : str), 0, 1, wnd);
+                HeapFree(GetProcessHeap(), 0, tgt);
+                break;
+            }
         default:
             WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]);
         }
@@ -1736,16 +1764,6 @@ BOOL    HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd,
     if (!HLPFILE_RtfAddControl(rd, "{\\colortbl ;\\red0\\green128\\blue0;")) return FALSE;
     for (index = 0; index < hlpfile->numFonts; index++)
     {
-        const char* family;
-        switch (hlpfile->fonts[index].LogFont.lfPitchAndFamily & 0xF0)
-        {
-        case FF_MODERN:     family = "modern";  break;
-        case FF_ROMAN:      family = "roman";   break;
-        case FF_SWISS:      family = "swiss";   break;
-        case FF_SCRIPT:     family = "script";  break;
-        case FF_DECORATIVE: family = "decor";   break;
-        default:            family = "nil";     break;
-        }
         sprintf(tmp, "\\red%d\\green%d\\blue%d;",
                 GetRValue(hlpfile->fonts[index].color),
                 GetGValue(hlpfile->fonts[index].color),

reactos/base/applications/winhlp32/macro.c

@@ -25,6 +25,7 @@
 
 #include "windows.h"
 #include "commdlg.h"
+#include "shellapi.h"
 #include "winhelp.h"
 
 #include "wine/debug.h"
@@ -64,6 +65,9 @@ static WINHELP_BUTTON**        MACRO_LookupButton(WINHELP_WINDOW* win, LPCSTR na
     return b;
 }
 
+/******* some forward declarations *******/
+static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id);
+
 /******* real macro implementation *******/
 
 void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro)
@@ -352,9 +356,20 @@ static void CALLBACK MACRO_EndMPrint(void)
     WINE_FIXME("()\n");
 }
 
-static void CALLBACK MACRO_ExecFile(LPCSTR str1, LPCSTR str2, LONG u, LPCSTR str3)
+static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCSTR topic)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %u, \"%s\")\n", str1, str2, u, str3);
+    HINSTANCE ret;
+
+    WINE_TRACE("(%s, %s, %u, %s)\n",
+               wine_dbgstr_a(pgm), wine_dbgstr_a(args), cmd_show, wine_dbgstr_a(topic));
+
+    ret = ShellExecuteA(Globals.active_win ? Globals.active_win->hMainWnd : NULL, "open",
+                        pgm, args, ".", cmd_show);
+    if ((DWORD_PTR)ret < 32)
+    {
+        WINE_WARN("Failed with %p\n", ret);
+        if (topic) MACRO_JumpID(NULL, topic);
+    }
 }
 
 static void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u)

reactos/base/applications/winhlp32/rsrc.rc

@@ -26,7 +26,6 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico
 
 #include "Bg.rc"
 #include "Cs.rc"
-#include "Da.rc"
 #include "En.rc"
 #include "Es.rc"
 #include "Fi.rc"
@@ -39,6 +38,7 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico
 #include "Tr.rc"
 
 /* UTF-8 */
+#include "Da.rc"
 #include "De.rc"
 #include "Fr.rc"
 #include "It.rc"
@@ -50,4 +50,5 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico
 #include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
+#include "Uk.rc"
 #include "Zh.rc"

reactos/base/applications/winhlp32/string.c

@@ -22,7 +22,6 @@
 
 const char MAIN_WIN_CLASS_NAME[]       = "MS_WINHELP";
 const char BUTTON_BOX_WIN_CLASS_NAME[] = "WHButtonBox";
-const char SHADOW_WIN_CLASS_NAME[]     = "WHShadow";
 const char HISTORY_WIN_CLASS_NAME[]    = "WHHistory";
 const char STRING_BUTTON[]             = "BUTTON";
 

reactos/base/applications/winhlp32/winhelp.c

@@ -570,7 +570,6 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win)
     WINHELP_DeleteButtons(win);
 
     if (win->page) WINHELP_DeletePageLinks(win->page);
-    if (win->hShadowWnd) DestroyWindow(win->hShadowWnd);
     if (win->hHistoryWnd) DestroyWindow(win->hHistoryWnd);
 
     DeleteObject(win->hBrush);
@@ -713,26 +712,37 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
         {
             if (!lstrcmpi(win->info->name, wpage->wininfo->name))
             {
-                POINT   pt = {0, 0};
+                if (win->page == wpage->page && win->info == wpage->wininfo)
-                SIZE    sz = {0, 0};
+                {
-                DWORD   flags = SWP_NOSIZE | SWP_NOMOVE;
+                    /* see #22979, some hlp files have a macro (run at page opening), which
-
+                     * jumps to the very same page
+                     * Exit gracefully in that case
+                     */
+                    return TRUE;
+                }
                 WINHELP_DeleteButtons(win);
                 bReUsed = TRUE;
                 SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage));
-                if (wpage->wininfo->origin.x != CW_USEDEFAULT &&
+                if (win->info != wpage->wininfo)
-                    wpage->wininfo->origin.y != CW_USEDEFAULT)
                 {
-                    pt = wpage->wininfo->origin;
+                    POINT   pt = {0, 0};
-                    flags &= ~SWP_NOSIZE;
+                    SIZE    sz = {0, 0};
+                    DWORD   flags = SWP_NOSIZE | SWP_NOMOVE;
+
+                    if (wpage->wininfo->origin.x != CW_USEDEFAULT &&
+                        wpage->wininfo->origin.y != CW_USEDEFAULT)
+                    {
+                        pt = wpage->wininfo->origin;
+                        flags &= ~SWP_NOSIZE;
+                    }
+                    if (wpage->wininfo->size.cx != CW_USEDEFAULT &&
+                        wpage->wininfo->size.cy != CW_USEDEFAULT)
+                    {
+                        sz = wpage->wininfo->size;
+                        flags &= ~SWP_NOMOVE;
+                    }
+                    SetWindowPos(win->hMainWnd, HWND_TOP, pt.x, pt.y, sz.cx, sz.cy, flags);
                 }
-                if (wpage->wininfo->size.cx != CW_USEDEFAULT &&
-                    wpage->wininfo->size.cy != CW_USEDEFAULT)
-                {
-                    sz = wpage->wininfo->size;
-                    flags &= ~SWP_NOMOVE;
-                }
-                SetWindowPos(win->hMainWnd, HWND_TOP, pt.x, pt.y, sz.cx, sz.cy, flags);
 
                 if (wpage->page && win->page && wpage->page->file != win->page->file)
                     WINHELP_DeleteBackSet(win);
@@ -817,7 +827,8 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
     }
 
     hIcon = (wpage->page) ? wpage->page->file->hIcon : NULL;
-    if (!hIcon) hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP));
+    if (!hIcon) hIcon = LoadImage(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP), IMAGE_ICON,
+                                  GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED);
     SendMessage(win->hMainWnd, WM_SETICON, ICON_SMALL, (DWORD_PTR)hIcon);
 
     /* Initialize file specific pushbuttons */
@@ -842,7 +853,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
     if (bPopup)
     {
         DWORD   mask = SendMessage(hTextWnd, EM_GETEVENTMASK, 0, 0);
-        RECT    rect;
 
         win->font_scale = Globals.active_win->font_scale;
         WINHELP_SetupText(hTextWnd, win, wpage->relative);
@@ -852,17 +862,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
         SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask | ENM_REQUESTRESIZE);
         SendMessage(hTextWnd, EM_REQUESTRESIZE, 0, 0);
         SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask);
-
-        GetWindowRect(win->hMainWnd, &rect);
-        win->hShadowWnd = CreateWindowEx(WS_EX_TOOLWINDOW, SHADOW_WIN_CLASS_NAME,
-                                         "", WS_POPUP | WS_VISIBLE,
-                                         rect.left + SHADOW_DX, rect.top + SHADOW_DY,
-                                         rect.right - rect.left,
-                                         rect.bottom - rect.top,
-                                         Globals.active_win->hMainWnd, 0,
-                                         Globals.hInstance, NULL);
-        SetWindowPos(win->hMainWnd, win->hShadowWnd, 0, 0, 0, 0,
-                     SWP_NOSIZE | SWP_NOMOVE);
     }
     else
     {
@@ -968,7 +967,7 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
         }
         break;
     case WM_ACTIVATE:
-        if (wParam != WA_INACTIVE || (HWND)lParam == Globals.active_win->hMainWnd ||
+        if (LOWORD(wParam) != WA_INACTIVE || (HWND)lParam == Globals.active_win->hMainWnd ||
             (HWND)lParam == Globals.active_popup->hMainWnd ||
             GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd)
             break;
@@ -976,7 +975,6 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
         if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam))
             return FALSE;
         /* fall through */
-    case WM_LBUTTONUP:
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN:
     case WM_NCLBUTTONDOWN:
@@ -1197,16 +1195,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara
     return DefWindowProc(hWnd, msg, wParam, lParam);
 }
 
-/***********************************************************************
- *
- *           WINHELP_ShadowWndProc
- */
-static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    if (WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL)) return 0;
-    return WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL) ? 0L : DefWindowProc(hWnd, msg, wParam, lParam);
-}
-
 /**************************************************************************
  * cb_KWBTree
  *
@@ -1306,12 +1294,9 @@ static INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
  */
 static INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    static struct index_data* id;
-
     switch (msg)
     {
     case WM_INITDIALOG:
-        id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam;
         return TRUE;
     case WM_NOTIFY:
 	switch (((NMHDR*)lParam)->code)
@@ -1337,7 +1322,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
 {
     WINHELP_WINDOW *win;
     WINHELP_BUTTON *button;
-    INT  keyDelta;
     HWND hTextWnd;
     LRESULT ret;
 
@@ -1451,7 +1435,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
         break;
 
     case WM_KEYDOWN:
-        keyDelta = 0;
         win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
         hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT);
 
@@ -1633,8 +1616,9 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search)
  */
 static BOOL WINHELP_RegisterWinClasses(void)
 {
-    WNDCLASS class_main, class_button_box, class_shadow, class_history;
+    WNDCLASSEX class_main, class_button_box, class_history;
 
+    class_main.cbSize              = sizeof(class_main);
     class_main.style               = CS_HREDRAW | CS_VREDRAW;
     class_main.lpfnWndProc         = WINHELP_MainWndProc;
     class_main.cbClsExtra          = 0;
@@ -1645,6 +1629,9 @@ static BOOL WINHELP_RegisterWinClasses(void)
     class_main.hbrBackground       = (HBRUSH)(COLOR_WINDOW+1);
     class_main.lpszMenuName        = 0;
     class_main.lpszClassName       = MAIN_WIN_CLASS_NAME;
+    class_main.hIconSm             = LoadImage(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP), IMAGE_ICON,
+                                               GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
+                                               LR_SHARED);
 
     class_button_box               = class_main;
     class_button_box.lpfnWndProc   = WINHELP_ButtonBoxWndProc;
@@ -1652,20 +1639,13 @@ static BOOL WINHELP_RegisterWinClasses(void)
     class_button_box.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
     class_button_box.lpszClassName = BUTTON_BOX_WIN_CLASS_NAME;
 
-    class_shadow                   = class_main;
-    class_shadow.lpfnWndProc       = WINHELP_ShadowWndProc;
-    class_shadow.cbWndExtra        = 0;
-    class_shadow.hbrBackground     = (HBRUSH)(COLOR_3DDKSHADOW+1);
-    class_shadow.lpszClassName     = SHADOW_WIN_CLASS_NAME;
-
     class_history                  = class_main;
     class_history.lpfnWndProc      = WINHELP_HistoryWndProc;
     class_history.lpszClassName    = HISTORY_WIN_CLASS_NAME;
 
-    return (RegisterClass(&class_main) &&
+    return (RegisterClassEx(&class_main) &&
-            RegisterClass(&class_button_box) &&
+            RegisterClassEx(&class_button_box) &&
-            RegisterClass(&class_shadow) &&
+            RegisterClassEx(&class_history));
-            RegisterClass(&class_history));
 }
 
 /***********************************************************************

reactos/base/applications/winhlp32/winhelp.h

@@ -76,7 +76,6 @@ typedef struct tagWinHelp
     HLPFILE_PAGE*       page;
 
     HWND                hMainWnd;
-    HWND                hShadowWnd;
     HWND                hHistoryWnd;
 
     WNDPROC             origRicheditWndProc;

reactos/base/applications/wordpad/Da.rc

@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 by Jens Albretsen <jens@albretsen.dk>
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,6 +19,8 @@
 
 #include "wordpad.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -25,12 +28,12 @@ BEGIN
     POPUP "&Fil"
     BEGIN
         MENUITEM "&Ny...\tCtrl+N",            ID_FILE_NEW
-        MENUITEM "&Åben...\tCtrl+O",          ID_FILE_OPEN
+        MENUITEM "&Åben...\tCtrl+O",          ID_FILE_OPEN
         MENUITEM "&Gemme\tCtrl+S",            ID_FILE_SAVE
         MENUITEM "Gemme &som...",             ID_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Udskriv...\tCtrl+P",       ID_PRINT
-        MENUITEM "&Forhåndsvisning...",       ID_PREVIEW
+        MENUITEM "&Forhåndsvisning...",       ID_PREVIEW
         MENUITEM "&Side indstillinger...",    ID_PRINTSETUP
         MENUITEM SEPARATOR
         MENUITEM "&Afslut",                   ID_FILE_EXIT
@@ -42,20 +45,20 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Klip\tCtrl+X",             ID_EDIT_CUT
         MENUITEM "K&opier\tCtrl+C",           ID_EDIT_COPY
-        MENUITEM "&Indsæt\tCtrl+V",           ID_EDIT_PASTE
+        MENUITEM "&Indsæt\tCtrl+V",           ID_EDIT_PASTE
         MENUITEM "&Fjern\tDEL",               ID_EDIT_CLEAR
         MENUITEM "&Marker alt\tCtrl+A",       ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "&Søg efter...\tCtrl+F",     ID_FIND
+        MENUITEM "&Søg efter...\tCtrl+F",     ID_FIND
-        MENUITEM "Søg efter &næste\tF3",      ID_FIND_NEXT
+        MENUITEM "Søg efter &næste\tF3",      ID_FIND_NEXT
         MENUITEM "E&rstat...\tCtrl+H",        ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "S&krivebeskyttet",          ID_EDIT_READONLY
-        MENUITEM "Æ&ndret",                   ID_EDIT_MODIFIED
+        MENUITEM "Æ&ndret",                   ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "&Ekstra"
         BEGIN
-            MENUITEM "&Information om markeret område", ID_EDIT_SELECTIONINFO
+            MENUITEM "&Information om markeret område", ID_EDIT_SELECTIONINFO
             MENUITEM "Tegn&format",           ID_EDIT_CHARFORMAT
             MENUITEM "Stan&dard tegnformat",  ID_EDIT_DEFCHARFORMAT
             MENUITEM "&Afsnitsformat",        ID_EDIT_PARAFORMAT
@@ -64,14 +67,14 @@ BEGIN
     END
     POPUP "&Vis"
     BEGIN
-        MENUITEM "Værk&tøjslinie",            ID_TOGGLE_TOOLBAR
+        MENUITEM "Værk&tøjslinie",            ID_TOGGLE_TOOLBAR
         MENUITEM "&Formatteringlinie",        ID_TOGGLE_FORMATBAR
         MENUITEM "&Lineal",                   ID_TOGGLE_RULER
         MENUITEM "&Statuslinie",              ID_TOGGLE_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Alternativer...",          ID_VIEWPROPERTIES
     END
-    POPUP "&Indsæt"
+    POPUP "&Indsæt"
     BEGIN
         MENUITEM "&Dato og tid...",           ID_DATETIME
     END
@@ -87,7 +90,7 @@ BEGIN
             MENUITEM "&Huskeseddel\tCtrl+2",  ID_BACK_2
         END
     END
-    POPUP "&Hjælp"
+    POPUP "&Hjælp"
     BEGIN
         MENUITEM "&Om Wine Wordpad"           ID_ABOUT
     END
@@ -99,7 +102,7 @@ BEGIN
     BEGIN
         MENUITEM "&Klip"                ID_EDIT_CUT
         MENUITEM "K&opier"              ID_EDIT_COPY
-        MENUITEM "&Indsæt"              ID_EDIT_PASTE
+        MENUITEM "&Indsæt"              ID_EDIT_PASTE
         MENUITEM SEPARATOR
         MENUITEM "&Bullets"             ID_BULLET
         MENUITEM "&Afsnit..."           ID_PARAFORMAT
@@ -111,18 +114,18 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM "Sort",      ID_COLOR_BLACK
-        MENUITEM "Mørkerød",  ID_COLOR_MAROON
+        MENUITEM "Mørkerød",  ID_COLOR_MAROON
-        MENUITEM "Grøn",      ID_COLOR_GREEN
+        MENUITEM "Grøn",      ID_COLOR_GREEN
         MENUITEM "Oliven"     ID_COLOR_OLIVE
         MENUITEM "Navy"       ID_COLOR_NAVY
         MENUITEM "Lilla"      ID_COLOR_PURPLE
         MENUITEM "Teal"       ID_COLOR_TEAL
-        MENUITEM "Grå"        ID_COLOR_GRAY
+        MENUITEM "Grå"        ID_COLOR_GRAY
-        MENUITEM "Sølv"       ID_COLOR_SILVER
+        MENUITEM "Sølv"       ID_COLOR_SILVER
-        MENUITEM "Rød"        ID_COLOR_RED
+        MENUITEM "Rød"        ID_COLOR_RED
         MENUITEM "Lime"       ID_COLOR_LIME
         MENUITEM "Gul"        ID_COLOR_YELLOW
-        MENUITEM "Blå"        ID_COLOR_BLUE
+        MENUITEM "Blå"        ID_COLOR_BLUE
         MENUITEM "Violet"     ID_COLOR_FUCHSIA
         MENUITEM "Cyan"       ID_COLOR_AQUA
         MENUITEM "Hvid"       ID_COLOR_WHITE
@@ -135,7 +138,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Dato og tid"
 FONT 10, "MS Sans Serif"
 BEGIN
-    LTEXT        "Tilgængelige formater",-1,3,2,100,15
+    LTEXT        "Tilgængelige formater",-1,3,2,100,15
     LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
     PUSHBUTTON   "&OK",IDOK,87,12,40,12
     PUSHBUTTON   "&Annuller",IDCANCEL,87,26,40,12
@@ -160,9 +163,9 @@ BEGIN
     GROUPBOX "Indryk", -1, 10, 10, 120, 68
     LTEXT "Venstre", -1, 15, 22, 40, 13
     EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Højre", -1, 15, 40, 40, 13
+    LTEXT "Højre", -1, 15, 40, 40, 13
     EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "Første linie", -1, 15, 58, 40, 13
+    LTEXT "Første linie", -1, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Justering", -1, 15, 87, 40, 13
     COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
@@ -177,7 +180,7 @@ FONT 8, "MS SHell DLg"
 BEGIN
     GROUPBOX "Tabulatorstop", -1, 10, 10, 120, 90
     COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Tilføj", ID_TAB_ADD, 20, 80, 45, 15
+    DEFPUSHBUTTON "&Tilføj", ID_TAB_ADD, 20, 80, 45, 15
     PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15
@@ -193,8 +196,8 @@ BEGIN
     RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "Værktøjslinier", -1, 150, 10, 120, 85
+    GROUPBOX "Værktøjslinier", -1, 150, 10, 120, 85
-    CHECKBOX "&Værktøjslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15
+    CHECKBOX "&Værktøjslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15
     CHECKBOX "&Lineal", IDC_PAGEFMT_RU, 160, 56, 80, 15
     CHECKBOX "&Statuslinie", IDC_PAGEFMT_SB, 160, 74, 80, 15
@@ -219,7 +222,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_ALIGN_LEFT,            "Venstrestillet"
-    STRING_ALIGN_RIGHT,           "Højrestillet"
+    STRING_ALIGN_RIGHT,           "Højrestillet"
     STRING_ALIGN_CENTER,          "Midterstillet"
 END
 
@@ -238,31 +241,36 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_PREVIEW_PRINT,            "Udskriv"
-    STRING_PREVIEW_NEXTPAGE,         "Næste side"
+    STRING_PREVIEW_NEXTPAGE,         "Næste side"
     STRING_PREVIEW_PREVPAGE,         "Forrige side"
     STRING_PREVIEW_TWOPAGES,         "To sider"
-    STRING_PREVIEW_ONEPAGE,          "Én side"
+    STRING_PREVIEW_ONEPAGE,          "Én side"
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Luk"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "Side"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "Sider"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "tomme"
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "tommer"
-BEGIN
+    STRING_UNITS_PT,                 "pkt"
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Dokument"
-    STRING_PROMPT_SAVE_CHANGES,  "Gemme ændringer i «%s»?"
+    STRING_PROMPT_SAVE_CHANGES,  "Gemme ændringer i «%s»?"
-    STRING_SEARCH_FINISHED,      "Færdig med at søge i dokumentet."
+    STRING_SEARCH_FINISHED,      "Færdig med at søge i dokumentet."
-    STRING_LOAD_RICHED_FAILED,   "Kunne ikke indlæse RichEdit-biblioteket."
+    STRING_LOAD_RICHED_FAILED,   "Kunne ikke indlæse RichEdit-biblioteket."
     STRING_SAVE_LOSEFORMATTING,  "Du har valgt at gemme i rent tekstformat, noget som " \
-                                 "vil medføre at al formatering går tabt. Er du " \
+                                 "vil medføre at al formatering går tabt. Er du " \
-                                 "sikker på at du vil fortsætte?"
+                                 "sikker på at du vil fortsætte?"
     STRING_INVALID_NUMBER,       "Ugyldigt talformat"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke understøttet"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke understøttet"
+    STRING_WRITE_FAILED,              "Kunne ikke gemme filen."
+    STRING_WRITE_ACCESS_DENIED,       "Filen kunne ikke gemmes, adgang nægtet."
+    STRING_OPEN_FAILED,               "Kunne ikke åbne filen."
+    STRING_OPEN_ACCESS_DENIED,        "Filen kunne ikke åbnes, adgang nægtet."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Udskrivning er endnu ikke implementeret."
+    STRING_MAX_TAB_STOPS,             "Kan ikke tilføje mere end 32 tabulatorer."
 END

reactos/base/applications/wordpad/De.rc

@@ -192,7 +192,7 @@ Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Zeilenumbruch", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "&Kein Zeilenumbruch", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Symbolleisten", -1, 150, 10, 120, 85
@@ -249,11 +249,10 @@ BEGIN
     STRING_PREVIEW_CLOSE,            "&Schließen"
     STRING_PREVIEW_PAGE,             "Seite"
     STRING_PREVIEW_PAGES,            "Seiten"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "in"
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "Zoll"
-BEGIN
+    STRING_UNITS_PT,                 "pt"
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/En.rc

@@ -240,6 +240,9 @@ BEGIN
     STRING_PREVIEW_PAGE,             "Page"
     STRING_PREVIEW_PAGES,            "Pages"
     STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "inch"
+    STRING_UNITS_PT,                 "pt"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/Fr.rc

@@ -1,5 +1,6 @@
 /*
  * Copyright 2006-2009 by Jonathan Ernst
+ * Copyright 2010      by Frédéric Delanoy
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -58,11 +59,11 @@ BEGIN
         MENUITEM SEPARATOR
         POPUP "&Avancé"
         BEGIN
-            MENUITEM "&Information sélection",      ID_EDIT_SELECTIONINFO
+            MENUITEM "&Informations sur la sélection",   ID_EDIT_SELECTIONINFO
-            MENUITEM "&Format caractères",          ID_EDIT_CHARFORMAT
+            MENUITEM "&Format de caractères",            ID_EDIT_CHARFORMAT
-            MENUITEM "&Déf. format car.",           ID_EDIT_DEFCHARFORMAT
+            MENUITEM "Format de caractères par &défaut", ID_EDIT_DEFCHARFORMAT
-            MENUITEM "Format paragrap&he",          ID_EDIT_PARAFORMAT
+            MENUITEM "Format de &paragraphe",            ID_EDIT_PARAFORMAT
-            MENUITEM "Texte &complet",              ID_EDIT_GETTEXT
+            MENUITEM "Texte &complet",                   ID_EDIT_GETTEXT
         END
     END
     POPUP "&Affichage"
@@ -129,7 +130,7 @@ BEGIN
         MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
         MENUITEM "Eau"         ID_COLOR_AQUA
         MENUITEM "Blanc"       ID_COLOR_WHITE
-        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
+        MENUITEM "Automatique" ID_COLOR_AUTOMATIC
     END
 END
 
@@ -250,11 +251,10 @@ BEGIN
     STRING_PREVIEW_CLOSE,            "Fermer"
     STRING_PREVIEW_PAGE,             "Page"
     STRING_PREVIEW_PAGES,            "Pages"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "po"
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "pouces"
-BEGIN
+    STRING_UNITS_PT,                 "pt"
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/It.rc

@@ -54,7 +54,7 @@ BEGIN
         MENUITEM "Trova s&uccessivo\tF3",              ID_FIND_NEXT
         MENUITEM "S&ostituisci...\tCtrl+H",         ID_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Sola &Lettura",                  ID_EDIT_READONLY
+        MENUITEM "Solo &Lettura",                  ID_EDIT_READONLY
         MENUITEM "&Modificato",                   ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "E&xtra"
@@ -81,7 +81,7 @@ BEGIN
     END
     POPUP "F&ormato"
     BEGIN
-        MENUITEM "&Font...",                     ID_FONTSETTINGS
+        MENUITEM "&Carattere...",                     ID_FONTSETTINGS
         MENUITEM "&Elenco"                ID_BULLET
         MENUITEM "&Paragrafo..."                 ID_PARAFORMAT
         MENUITEM "&Tabulazioni..."                      ID_TABSTOPS
@@ -93,7 +93,7 @@ BEGIN
     END
     POPUP "&Aiuto"
     BEGIN
-        MENUITEM "&Su Wine Wordpad"       ID_ABOUT
+        MENUITEM "&Riguardo A Wine Wordpad"       ID_ABOUT
     END
 END
 
@@ -208,9 +208,9 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_ALL_FILES,              "Tutti i files (*.*)"
-    STRING_TEXT_FILES_TXT,         "Files di testo (*.txt)"
+    STRING_TEXT_FILES_TXT,         "File di testo (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Files di testo Unicode (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "File di testo Unicode (*.txt)"
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
     STRING_NEWFILE_RICHTEXT,       "Documento Rich text"
     STRING_NEWFILE_TXT,            "Documento di testo"
     STRING_NEWFILE_TXT_UNICODE,    "Documento di testo Unicode"
@@ -241,9 +241,12 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Ingrandisci"
     STRING_PREVIEW_ZOOMOUT,          "Rimpicciolisci"
     STRING_PREVIEW_CLOSE,            "Chiudi"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "Pagina"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "Pagine"
     STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "po"
+    STRING_UNITS_INCH,               "pollici"
+    STRING_UNITS_PT,                 "pt"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/Ja.rc

@@ -129,17 +129,17 @@ BEGIN
         MENUITEM "赤紫"     ID_COLOR_FUCHSIA
         MENUITEM "水色"     ID_COLOR_AQUA
         MENUITEM "白"       ID_COLOR_WHITE
-        MENUITEM "Automatic" ID_COLOR_AUTOMATIC
+        MENUITEM "自動"     ID_COLOR_AUTOMATIC
     END
 END
 
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "日付と時刻"
-FONT 9, "MS Shell Dlg"
+FONT 10, "MS Shell Dlg"
 BEGIN
     LTEXT        "利用できる形式",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY
+    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
     PUSHBUTTON   "&OK",IDOK,87,12,40,12
     PUSHBUTTON   "キャンセル(&C)",IDCANCEL,87,26,40,12
 END
@@ -147,7 +147,7 @@ END
 IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "新規作成"
-FONT 9, "MS Shell Dlg"
+FONT 10, "MS Shell Dlg"
 BEGIN
     LTEXT        "新しい文書形式",-1,3,2,100,15
     LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
@@ -193,7 +193,7 @@ CAPTION ""
 FONT 9, "MS Shell Dlg"
 BEGIN
     GROUPBOX "行の折り返し", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "折り返ししない", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "ウィンドウの境界で折り返す(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "マージンで折り返す(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "ツールバー", -1, 150, 10, 120, 85
@@ -206,10 +206,14 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "リッチテキスト形式 (*.rtf)"
+    STRING_ALL_FILES,              "すべてのファイル (*.*)"
     STRING_TEXT_FILES_TXT,         "テキスト文書 (*.txt)"
     STRING_TEXT_FILES_UNICODE_TXT, "Unicodeテキスト文書(*.txt)"
-    STRING_ALL_FILES,              "すべてのファイル (*.*)"
+    STRING_RICHTEXT_FILES_RTF,     "リッチテキスト形式 (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "リッチテキスト文書"
+    STRING_NEWFILE_TXT,            "テキスト文書"
+    STRING_NEWFILE_TXT_UNICODE,    "Unicodeテキスト文書"
+    STRING_PRINTER_FILES_PRN,      "プリンタファイル (*.PRN)"
 END
 
 STRINGTABLE DISCARDABLE
@@ -219,18 +223,6 @@ BEGIN
     STRING_ALIGN_CENTER,          "中央"
 END
 
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "リッチテキスト文書"
-    STRING_NEWFILE_TXT,          "テキスト文書"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicodeテキスト文書"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "プリンタファイル (*.PRN)"
-END
-
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_VIEWPROPS_TITLE,          "オプション"
@@ -245,16 +237,15 @@ BEGIN
     STRING_PREVIEW_PREVPAGE,         "前のページ"
     STRING_PREVIEW_TWOPAGES,         "2ページ"
     STRING_PREVIEW_ONEPAGE,          "1ページ"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
+    STRING_PREVIEW_ZOOMIN,           "拡大"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_ZOOMOUT,          "縮小"
     STRING_PREVIEW_CLOSE,            "閉じる"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "ページ"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "ページ"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "in"
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "インチ"
-BEGIN
+    STRING_UNITS_PT,                 "pt"
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/Ko.rc

@@ -242,6 +242,9 @@ BEGIN
     STRING_PREVIEW_PAGE,             "페이지"
     STRING_PREVIEW_PAGES,            "페이지들"
     STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "인치"
+    STRING_UNITS_PT,                 "pt"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/Lt.rc

@@ -250,11 +250,10 @@ BEGIN
     STRING_PREVIEW_CLOSE,            "Užverti"
     STRING_PREVIEW_PAGE,             "Puslapis"
     STRING_PREVIEW_PAGES,            "Puslapiai"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "col."
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "coliai"
-BEGIN
+    STRING_UNITS_PT,                 "tašk."
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/Nl.rc

@@ -21,6 +21,8 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
+#pragma code_page(65001)
+
 IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Bestand"
@@ -30,26 +32,26 @@ BEGIN
         MENUITEM "Op&slaan\tCtrl+S",      ID_FILE_SAVE
         MENUITEM "Ops&laan als...",       ID_FILE_SAVEAS
         MENUITEM SEPARATOR
-        MENUITEM "&Print...\tCtrl+P",     ID_PRINT
+        MENUITEM "Af&drukken...\tCtrl+P",     ID_PRINT
-        MENUITEM "Print &voorbeeld...",     ID_PREVIEW
+        MENUITEM "Afdruk&voorbeeld...",     ID_PREVIEW
-        MENUITEM "Pa&gina setup...",        ID_PRINTSETUP
+        MENUITEM "Pa&gina-instellingen...",        ID_PRINTSETUP
         MENUITEM SEPARATOR
         MENUITEM "&Afsluiten",    ID_FILE_EXIT
     END
     POPUP "Be&werken"
     BEGIN
         MENUITEM "&Ongedaan maken\tCtrl+Z",     ID_EDIT_UNDO
-        MENUITEM "O&pnieuw\tCtrl+Y",            ID_EDIT_REDO
+        MENUITEM "Opn&ieuw\tCtrl+Y",            ID_EDIT_REDO
         MENUITEM SEPARATOR
         MENUITEM "K&nippen\tCtrl+X",            ID_EDIT_CUT
-        MENUITEM "&Kopieren\tCtrl+C",           ID_EDIT_COPY
+        MENUITEM "&Kopiëren\tCtrl+C",           ID_EDIT_COPY
         MENUITEM "&Plakken\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM "&Verwijderen\tDel",           ID_EDIT_CLEAR
         MENUITEM "&Alles selecteren\tCtrl+A",   ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "&Zoeken...\tCtrl+F",            ID_FIND
         MENUITEM "Zoek vo&lgende\tF3",              ID_FIND_NEXT
-        MENUITEM "Ve&rvang...\tCtrl+H",         ID_REPLACE
+        MENUITEM "Ve&rvangen...\tCtrl+H",         ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "Alleen &lezen",               ID_EDIT_READONLY
         MENUITEM "&Gewijzigd",                  ID_EDIT_MODIFIED
@@ -65,9 +67,9 @@ BEGIN
     END
     POPUP "&Bekijken"
     BEGIN
-        MENUITEM "&Toolbalk",      ID_TOGGLE_TOOLBAR
+        MENUITEM "&Gereedschapsbalk",      ID_TOGGLE_TOOLBAR
         MENUITEM "&Formaatbalk",   ID_TOGGLE_FORMATBAR
-        MENUITEM "&Lineaal",       ID_TOGGLE_RULER
+        MENUITEM "&Liniaal",       ID_TOGGLE_RULER
         MENUITEM "&Statusbalk",    ID_TOGGLE_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Opties...",     ID_VIEWPROPERTIES
@@ -99,7 +101,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM "K&nippen",             ID_EDIT_CUT
-        MENUITEM "&Kopieren",            ID_EDIT_COPY
+        MENUITEM "&Kopiëren",            ID_EDIT_COPY
         MENUITEM "&Plakken",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
         MENUITEM "&Bullet points"        ID_BULLET
@@ -127,7 +129,7 @@ BEGIN
         MENUITEM "Fuchsiapaars"  ID_COLOR_FUCHSIA
         MENUITEM "Zeeblauw"      ID_COLOR_AQUA
         MENUITEM "Wit"           ID_COLOR_WHITE
-        MENUITEM "Automatic"     ID_COLOR_AUTOMATIC
+        MENUITEM "Automatisch"     ID_COLOR_AUTOMATIC
     END
 END
 
@@ -147,7 +149,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Nieuw"
 FONT 10, "MS Sans Serif"
 BEGIN
-    LTEXT        "Nieuw document type",-1,3,2,100,15
+    LTEXT        "Nieuw documenttype",-1,3,2,100,15
     LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
     PUSHBUTTON   "&OK",IDOK,97,12,40,12
     PUSHBUTTON   "&Annuleren",IDCANCEL,97,26,40,12
@@ -158,7 +160,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 Caption "Paragraaf formaat"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Indentation", -1, 10, 10, 120, 68
+    GROUPBOX "Inspringing", -1, 10, 10, 120, 68
     LTEXT "Links", -1, 15, 22, 40, 13
     EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
     LTEXT "Rechts", -1, 15, 40, 40, 13
@@ -176,7 +178,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 Caption "Tabs"
 FONT 8, "MS SHell DLg"
 BEGIN
-    GROUPBOX "Tab stops", -1, 10, 10, 120, 90
+    GROUPBOX "Tab-einden", -1, 10, 10, 120, 90
     COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
     DEFPUSHBUTTON "&Toevoegen", ID_TAB_ADD, 20, 80, 45, 15
     PUSHBUTTON "&Verwijderen", ID_TAB_DEL, 72, 80, 45, 15
@@ -191,13 +193,13 @@ Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Regel afbreken", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Geen regelafbraak", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "Breek tekst af bij &venster rand", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "Breek tekst af bij de &marge", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "Toolbars", -1, 150, 10, 120, 85
+    GROUPBOX "Gereedschapsbalken", -1, 150, 10, 120, 85
-    CHECKBOX "&Toolbalk", IDC_PAGEFMT_TB, 160, 20, 80, 15
+    CHECKBOX "&Gereedschapsbalk", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formaatbalk", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Lineaal", IDC_PAGEFMT_RU, 160, 56, 80, 15
+    CHECKBOX "&Liniaal", IDC_PAGEFMT_RU, 160, 56, 80, 15
     CHECKBOX "&Statusbalk", IDC_PAGEFMT_SB, 160, 74, 80, 15
     LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
 END
@@ -205,13 +207,13 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_ALL_FILES,              "Alle documenten (*.*)"
-    STRING_TEXT_FILES_TXT,         "Tekst documenten (*.txt)"
+    STRING_TEXT_FILES_TXT,         "Tekstdocumenten (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekst document (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekstdocument (*.txt)"
-    STRING_RICHTEXT_FILES_RTF,     "Rich text formaat (*.rtf)"
+    STRING_RICHTEXT_FILES_RTF,     "Rich tekstformaat (*.rtf)"
-    STRING_NEWFILE_RICHTEXT,       "Rich tekst document"
+    STRING_NEWFILE_RICHTEXT,       "Rich tekstdocument"
-    STRING_NEWFILE_TXT,            "Tekst document"
+    STRING_NEWFILE_TXT,            "Tekstdocument"
-    STRING_NEWFILE_TXT_UNICODE,    "Unicode tekst document"
+    STRING_NEWFILE_TXT_UNICODE,    "Unicode tekstdocument"
-    STRING_PRINTER_FILES_PRN,      "Printer bestanden (*.PRN)"
+    STRING_PRINTER_FILES_PRN,      "Afdrukbestanden (*.PRN)"
 END
 
 STRINGTABLE DISCARDABLE
@@ -230,38 +232,37 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
+    STRING_PREVIEW_PRINT,            "Afdrukken"
     STRING_PREVIEW_NEXTPAGE,         "Volgende pagina"
     STRING_PREVIEW_PREVPAGE,         "Vorige pagina"
     STRING_PREVIEW_TWOPAGES,         "Twee pagina's"
     STRING_PREVIEW_ONEPAGE,          "Een pagina"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
+    STRING_PREVIEW_ZOOMIN,           "Inzoomen"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_ZOOMOUT,          "Uitzoomen"
     STRING_PREVIEW_CLOSE,            "Sluiten"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "Pagina"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "Pagina's"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "in"
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "inch"
-BEGIN
+    STRING_UNITS_PT,                 "pt"
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
-    STRING_PROMPT_SAVE_CHANGES,  "Wijzigingen opslaan van '%s'?"
+    STRING_PROMPT_SAVE_CHANGES,  "Wijzigingen opslaan naar '%s'?"
-    STRING_SEARCH_FINISHED,      "Doorzoeken van document beeindigd."
+    STRING_SEARCH_FINISHED,      "Doorzoeken van document voltooid."
     STRING_LOAD_RICHED_FAILED,   "Laden van de RichEdit library is mislukt."
     STRING_SAVE_LOSEFORMATTING,  "U koos voor opslaan in gewoon tekst formaat, " \
-                                 "waardoor alle formatering verloren zal gaan. " \
+                                 "waardoor alle formattering verloren zal gaan. " \
                                  "Weet u zeker dat u dit wilt?"
-    STRING_INVALID_NUMBER,       "Foutief nummer formaat"
+    STRING_INVALID_NUMBER,       "Foutief nummerformaat"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documenten zijn niet ondersteund"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documenten worden niet ondersteund"
-    STRING_WRITE_FAILED,         "Bestand kon niet opgeslagen worden."
+    STRING_WRITE_FAILED,         "Bestand kon niet worden opgeslagen."
     STRING_WRITE_ACCESS_DENIED,  "Onvoldoende rechten om het bestand op te slaan."
-    STRING_OPEN_FAILED,          "Bestand kon niet geopend worden."
+    STRING_OPEN_FAILED,          "Bestand kon niet worden geopend."
     STRING_OPEN_ACCESS_DENIED,   "Onvoldoende rechten om het bestand te openen."
-    STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geimplementeerd"
+    STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geïmplementeerd"
     STRING_MAX_TAB_STOPS,        "Onmogelijk om meer dan 32 tab stops toe te voegen."
 END

reactos/base/applications/wordpad/Pl.rc

@@ -1,6 +1,7 @@
 /*
  * Copyright 2004 by Krzysztof Foltman
  * Copyright 2006 by Mikolaj Zalewski
+ * Copyright 2010 by £ukasz Wojni³owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -127,7 +128,7 @@ BEGIN
         MENUITEM "Fuksja"       ID_COLOR_FUCHSIA
         MENUITEM "Akwamaryna"   ID_COLOR_AQUA
         MENUITEM "Bia³y"        ID_COLOR_WHITE
-        MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
+        MENUITEM "Automatycznie"    ID_COLOR_AUTOMATIC
     END
 END
 
@@ -191,7 +192,7 @@ Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Zawijanie wierszy", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Bez zawijania wierszy", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Paski narzêdzi", -1, 150, 10, 120, 85
@@ -206,7 +207,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     STRING_RICHTEXT_FILES_RTF,     "Tekst sformatowany - RTF (*.rtf)"
     STRING_TEXT_FILES_TXT,         "Dokument tekstowy (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Dokument tekstowy Unicode (*.txt)"
     STRING_ALL_FILES,              "Wszystkie dokumenty (*.*)"
 END
 
@@ -219,9 +220,9 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Document sformatowany (RTF)"
+    STRING_NEWFILE_RICHTEXT,     "Dokument sformatowany (RTF)"
-    STRING_NEWFILE_TXT,          "Document tekstowy"
+    STRING_NEWFILE_TXT,          "Dokument tekstowy"
-    STRING_NEWFILE_TXT_UNICODE,  "Document tekstowy Unicode"
+    STRING_NEWFILE_TXT_UNICODE,  "Dokument tekstowy Unicode"
 END
 
 STRINGTABLE DISCARDABLE
@@ -241,18 +242,17 @@ BEGIN
     STRING_PREVIEW_PRINT,            "Drukuj"
     STRING_PREVIEW_NEXTPAGE,         "Nast. strona"
     STRING_PREVIEW_PREVPAGE,         "Poprz. strona"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
+    STRING_PREVIEW_TWOPAGES,         "Dwie strony"
-    STRING_PREVIEW_ONEPAGE,          "One page"
+    STRING_PREVIEW_ONEPAGE,          "Jedna strona"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
+    STRING_PREVIEW_ZOOMIN,           "Zbli¿"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_ZOOMOUT,          "Oddal"
     STRING_PREVIEW_CLOSE,            "Zamknij"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "Strona"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "Strony"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "cal"
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "cal"
-BEGIN
+    STRING_UNITS_PT,                 "punkt"
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE
@@ -266,4 +266,10 @@ BEGIN
                                  "Czy na pewno chcesz to zrobiæ?"
     STRING_INVALID_NUMBER,       "Z³y format liczby"
     STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenty typu OLE storage nie s¹ obs³ugiwane"
+    STRING_WRITE_FAILED,              "Nie mo¿na by³o zapisaæ pliku."
+    STRING_WRITE_ACCESS_DENIED,       "Nie masz dostêpu do zapisu pliku."
+    STRING_OPEN_FAILED,               "Nie mo¿na by³o otworzyæ pliku."
+    STRING_OPEN_ACCESS_DENIED,        "Nie masz dostêpu do otwarcia pliku."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Drukowanie niezaimplementowane"
+    STRING_MAX_TAB_STOPS,             "Nie mo¿na dodaæ wiêcej ni¿ 32 punkty tabulacji."
 END

reactos/base/applications/wordpad/Si.rc

@@ -247,13 +247,12 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Zapri"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "Stran"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "Strani"
-END
+    STRING_UNITS_CM,                 "cm"
-
+    STRING_UNITS_IN,                 "in"
-STRINGTABLE DISCARDABLE
+    STRING_UNITS_INCH,               "inch"
-BEGIN
+    STRING_UNITS_PT,                 "pt"
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/wordpad/print.c

@@ -487,7 +487,6 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName)
     StartDocW(fr.hdc, &di);
     do
     {
-        int bottom = fr.rc.bottom;
         if(StartPage(fr.hdc) <= 0)
             break;
 
@@ -495,7 +494,6 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName)
 
         if(EndPage(fr.hdc) <= 0)
             break;
-        bottom = fr.rc.bottom;
 
         printedPages++;
         if((pd->Flags & PD_PAGENUMS) && (printedPages > (pd->nToPage - pd->nFromPage)))
@@ -789,7 +787,6 @@ static void update_scaled_preview(HWND hMainWnd)
 
 void init_preview(HWND hMainWnd, LPWSTR wszFileName)
 {
-    HWND hwndPreview;
     HINSTANCE hInstance = GetModuleHandleW(0);
     preview.page = 1;
     preview.hdc = 0;
@@ -799,7 +796,7 @@ void init_preview(HWND hMainWnd, LPWSTR wszFileName)
     preview.zoomlevel = 0;
     preview_bar_show(hMainWnd, TRUE);
 
-    hwndPreview = CreateWindowExW(0, wszPreviewWndClass, NULL,
+    CreateWindowExW(0, wszPreviewWndClass, NULL,
             WS_VISIBLE | WS_CHILD | WS_VSCROLL | WS_HSCROLL,
             0, 0, 200, 10, hMainWnd, (HMENU)IDC_PREVIEW, hInstance, NULL);
 }

reactos/base/applications/wordpad/rsrc.rc

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2004 by Krzysztof Foltman
  * Copyright 2007 by Alexander N. Sørnes <alex@thehandofagony.com>
  *
@@ -52,33 +52,24 @@ IDB_FORMATBAR BITMAP "formatbar.bmp"
 /* @makedep: wordpad.ico */
 IDI_WORDPAD ICON "wordpad.ico"
 
-/* @makedep: rtf.ico */
-IDI_RTF ICON "rtf.ico"
-
-/* @makedep: wri.ico */
-IDI_WRI ICON "wri.ico"
-
-/* @makedep: txt.ico */
-IDI_TXT ICON "txt.ico"
-
 /* @makedep: zoom.cur */
 IDC_ZOOM CURSOR "zoom.cur"
 
 
-#include "Da.rc"
 #include "En.rc"
 #include "Hu.rc"
 #include "Ko.rc"
-#include "Nl.rc"
 #include "Pl.rc"
 #include "Tr.rc"
 
 /* UTF-8 */
+#include "Da.rc"
 #include "De.rc"
 #include "Fr.rc"
 #include "It.rc"
 #include "Ja.rc"
 #include "Lt.rc"
+#include "Nl.rc"
 #include "No.rc"
 #include "Pt.rc"
 #include "Ru.rc"

reactos/base/applications/wordpad/wordpad.c

@@ -76,11 +76,19 @@ static WCHAR wszFilter[MAX_STRING_LEN*4+6*3+5];
 static WCHAR wszDefaultFileName[MAX_STRING_LEN];
 static WCHAR wszSaveChanges[MAX_STRING_LEN];
 static WCHAR units_cmW[MAX_STRING_LEN];
-
+static WCHAR units_inW[MAX_STRING_LEN];
-static char units_cmA[MAX_STRING_LEN];
+static WCHAR units_inchW[MAX_STRING_LEN];
+static WCHAR units_ptW[MAX_STRING_LEN];
 
 static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam );
 
+typedef enum
+{
+    UNIT_CM,
+    UNIT_INCH,
+    UNIT_PT
+} UNIT;
+
 /* Load string resources */
 static void DoLoadStrings(void)
 {
@@ -115,8 +123,10 @@ static void DoLoadStrings(void)
     p = wszSaveChanges;
     LoadStringW(hInstance, STRING_PROMPT_SAVE_CHANGES, p, MAX_STRING_LEN);
 
-    LoadStringA(hInstance, STRING_UNITS_CM, units_cmA, MAX_STRING_LEN);
     LoadStringW(hInstance, STRING_UNITS_CM, units_cmW, MAX_STRING_LEN);
+    LoadStringW(hInstance, STRING_UNITS_IN, units_inW, MAX_STRING_LEN);
+    LoadStringW(hInstance, STRING_UNITS_INCH, units_inchW, MAX_STRING_LEN);
+    LoadStringW(hInstance, STRING_UNITS_PT, units_ptW, MAX_STRING_LEN);
 }
 
 /* Show a message box with resource strings */
@@ -239,8 +249,10 @@ static void set_caption(LPCWSTR wszNewFileName)
     HeapFree(GetProcessHeap(), 0, wszCaption);
 }
 
-static BOOL validate_endptr(LPCSTR endptr, BOOL units)
+static BOOL validate_endptr(LPCWSTR endptr, UNIT *punit)
 {
+    if(punit != NULL)
+        *punit = UNIT_CM;
     if(!endptr)
         return FALSE;
     if(!*endptr)
@@ -249,28 +261,45 @@ static BOOL validate_endptr(LPCSTR endptr, BOOL units)
     while(*endptr == ' ')
         endptr++;
 
-    if(!units)
+    if(punit == NULL)
         return *endptr == '\0';
 
-    /* FIXME: Allow other units and convert between them */
+    if(!lstrcmpW(endptr, units_cmW))
-    if(!lstrcmpA(endptr, units_cmA))
+    {
-        endptr += 2;
+        *punit = UNIT_CM;
+        endptr += lstrlenW(units_cmW);
+    }
+    else if (!lstrcmpW(endptr, units_inW))
+    {
+        *punit = UNIT_INCH;
+        endptr += lstrlenW(units_inW);
+    }
+    else if (!lstrcmpW(endptr, units_inchW))
+    {
+        *punit = UNIT_INCH;
+        endptr += lstrlenW(units_inchW);
+    }
+    else if (!lstrcmpW(endptr, units_ptW))
+    {
+        *punit = UNIT_PT;
+        endptr += lstrlenW(units_ptW);
+    }
 
     return *endptr == '\0';
 }
 
-static BOOL number_from_string(LPCWSTR string, float *num, BOOL units)
+static BOOL number_from_string(LPCWSTR string, float *num, UNIT *punit)
 {
     double ret;
-    char buffer[MAX_STRING_LEN];
+    WCHAR *endptr;
-    char *endptr = buffer;
 
-    WideCharToMultiByte(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN, NULL, NULL);
     *num = 0;
     errno = 0;
-    ret = strtod(buffer, &endptr);
+    ret = wcstod(string, &endptr);
 
-    if((ret == 0 && errno != 0) || endptr == buffer || !validate_endptr(endptr, units))
+    if (punit != NULL)
+        *punit = UNIT_CM;
+    if((ret == 0 && errno != 0) || endptr == string || !validate_endptr(endptr, punit))
     {
         return FALSE;
     } else
@@ -304,7 +333,7 @@ static void on_sizelist_modified(HWND hwndSizeList, LPWSTR wszNewFontSize)
     if(lstrcmpW(sizeBuffer, wszNewFontSize))
     {
         float size = 0;
-        if(number_from_string(wszNewFontSize, &size, FALSE)
+        if(number_from_string(wszNewFontSize, &size, NULL)
            && size > 0)
         {
             set_size(size);
@@ -703,17 +732,8 @@ static void preview_exit(HWND hMainWnd)
 
 static void set_fileformat(WPARAM format)
 {
-    HICON hIcon;
-    HINSTANCE hInstance = GetModuleHandleW(0);
     fileFormat = format;
 
-    if(format & SF_TEXT)
-        hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_TXT));
-    else
-        hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_RTF));
-
-    SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
-
     set_bar_states();
     set_default_font();
     target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);
@@ -1282,6 +1302,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr)
 static void dialog_find(LPFINDREPLACEW fr, BOOL replace)
 {
     static WCHAR findBuffer[MAX_STRING_LEN];
+    static WCHAR replaceBuffer[MAX_STRING_LEN];
 
     /* Allow only one search/replace dialog to open */
     if(hFindWnd != NULL)
@@ -1295,8 +1316,10 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace)
     fr->hwndOwner = hMainWnd;
     fr->Flags = FR_HIDEUPDOWN;
     fr->lpstrFindWhat = findBuffer;
+    fr->lpstrReplaceWith = replaceBuffer;
     fr->lCustData = -1;
-    fr->wFindWhatLen = MAX_STRING_LEN*sizeof(WCHAR);
+    fr->wFindWhatLen = sizeof(findBuffer);
+    fr->wReplaceWithLen = sizeof(replaceBuffer);
 
     if(replace)
         hFindWnd = ReplaceTextW(fr);
@@ -1304,9 +1327,25 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace)
         hFindWnd = FindTextW(fr);
 }
 
-static int current_units_to_twips(float number)
+static int units_to_twips(UNIT unit, float number)
 {
-    int twips = (int)(number * 1000.0 / (float)CENTMM_PER_INCH *  (float)TWIPS_PER_INCH);
+    int twips = 0;
+
+    switch(unit)
+    {
+    case UNIT_CM:
+        twips = (int)(number * 1000.0 / (float)CENTMM_PER_INCH * (float)TWIPS_PER_INCH);
+        break;
+
+    case UNIT_INCH:
+        twips = (int)(number * (float)TWIPS_PER_INCH);
+        break;
+
+    case UNIT_PT:
+        twips = (int)(number * (0.0138 * (float)TWIPS_PER_INCH));
+        break;
+    }
+
     return twips;
 }
 
@@ -1515,22 +1554,23 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam,
                         float num;
                         int ret = 0;
                         PARAFORMAT pf;
+                        UNIT unit;
 
                         index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0);
                         pf.wAlignment = ALIGNMENT_VALUES[index];
 
                         GetWindowTextW(hLeftWnd, buffer, MAX_STRING_LEN);
-                        if(number_from_string(buffer, &num, TRUE))
+                        if(number_from_string(buffer, &num, &unit))
                             ret++;
-                        pf.dxOffset = current_units_to_twips(num);
+                        pf.dxOffset = units_to_twips(unit, num);
                         GetWindowTextW(hRightWnd, buffer, MAX_STRING_LEN);
-                        if(number_from_string(buffer, &num, TRUE))
+                        if(number_from_string(buffer, &num, &unit))
                             ret++;
-                        pf.dxRightIndent = current_units_to_twips(num);
+                        pf.dxRightIndent = units_to_twips(unit, num);
                         GetWindowTextW(hFirstWnd, buffer, MAX_STRING_LEN);
-                        if(number_from_string(buffer, &num, TRUE))
+                        if(number_from_string(buffer, &num, &unit))
                             ret++;
-                        pf.dxStartIndent = current_units_to_twips(num);
+                        pf.dxStartIndent = units_to_twips(unit, num);
 
                         if(ret != 3)
                         {
@@ -1636,6 +1676,7 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP
                     {
                         HWND hTabWnd = GetDlgItem(hWnd, IDC_TABSTOPS);
                         WCHAR buffer[MAX_STRING_LEN];
+                        UNIT unit;
 
                         GetWindowTextW(hTabWnd, buffer, MAX_STRING_LEN);
                         append_current_units(buffer);
@@ -1645,7 +1686,7 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP
                             float number = 0;
                             int item_count = SendMessage(hTabWnd, CB_GETCOUNT, 0, 0);
 
-                            if(!number_from_string(buffer, &number, TRUE))
+                            if(!number_from_string(buffer, &number, &unit))
                             {
                                 MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER),
                                              wszAppTitle, MB_OK | MB_ICONINFORMATION);
@@ -1656,14 +1697,14 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP
                                 int i;
                                 float next_number = -1;
                                 int next_number_in_twips = -1;
-                                int insert_number = current_units_to_twips(number);
+                                int insert_number = units_to_twips(unit, number);
 
                                 /* linear search for position to insert the string */
                                 for(i = 0; i < item_count; i++)
                                 {
                                     SendMessageW(hTabWnd, CB_GETLBTEXT, i, (LPARAM)&buffer);
-                                    number_from_string(buffer, &next_number, TRUE);
+                                    number_from_string(buffer, &next_number, &unit);
-                                    next_number_in_twips = current_units_to_twips(next_number);
+                                    next_number_in_twips = units_to_twips(unit, next_number);
                                     if (insert_number <= next_number_in_twips)
                                         break;
                                 }
@@ -1704,6 +1745,7 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP
                         WCHAR buffer[MAX_STRING_LEN];
                         PARAFORMAT pf;
                         float number;
+                        UNIT unit;
 
                         pf.cbSize = sizeof(pf);
                         pf.dwMask = PFM_TABSTOPS;
@@ -1712,8 +1754,8 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP
                                                 (LPARAM)&buffer) != CB_ERR &&
                                                         i < MAX_TAB_STOPS; i++)
                         {
-                            number_from_string(buffer, &number, TRUE);
+                            number_from_string(buffer, &number, &unit);
-                            pf.rgxTabs[i] = current_units_to_twips(number);
+                            pf.rgxTabs[i] = units_to_twips(unit, number);
                         }
                         pf.cTabCount = i;
                         SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf);
@@ -2253,12 +2295,12 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
     case ID_EDIT_DEFCHARFORMAT:
         {
         CHARFORMAT2W cf;
-        LRESULT i;
+
         ZeroMemory(&cf, sizeof(cf));
         cf.cbSize = sizeof(cf);
         cf.dwMask = 0;
-        i = SendMessageW(hwndEditor, EM_GETCHARFORMAT,
+        SendMessageW(hwndEditor, EM_GETCHARFORMAT,
-                        LOWORD(wParam) == ID_EDIT_CHARFORMAT, (LPARAM)&cf);
+                     LOWORD(wParam) == ID_EDIT_CHARFORMAT, (LPARAM)&cf);
         return 0;
         }
 
@@ -2618,7 +2660,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
 {
     INITCOMMONCONTROLSEX classes = {8, ICC_BAR_CLASSES|ICC_COOL_CLASSES|ICC_USEREX_CLASSES};
     HACCEL hAccel;
-    WNDCLASSW wc;
+    WNDCLASSEXW wc;
     MSG msg;
     RECT rc;
     UINT_PTR hPrevRulerProc;
@@ -2632,17 +2674,20 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
 
     hAccel = LoadAcceleratorsW(hInstance, wszAccelTable);
 
+    wc.cbSize = sizeof(wc);
     wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc = WndProc;
     wc.cbClsExtra = 0;
     wc.cbWndExtra = 4;
     wc.hInstance = hInstance;
     wc.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD));
+    wc.hIconSm = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON,
+                            GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED);
     wc.hCursor = LoadCursor(NULL, IDC_IBEAM);
     wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW);
     wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MAINMENU);
     wc.lpszClassName = wszMainWndClass;
-    RegisterClassW(&wc);
+    RegisterClassExW(&wc);
 
     wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc = preview_proc;
@@ -2650,11 +2695,12 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
     wc.cbWndExtra = 0;
     wc.hInstance = hInstance;
     wc.hIcon = NULL;
+    wc.hIconSm = NULL;
     wc.hCursor = LoadCursor(NULL, IDC_IBEAM);
     wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW);
     wc.lpszMenuName = NULL;
     wc.lpszClassName = wszPreviewWndClass;
-    RegisterClassW(&wc);
+    RegisterClassExW(&wc);
 
     registry_read_winrect(&rc);
     hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW,

reactos/base/applications/wordpad/wordpad.h

@@ -185,11 +185,8 @@
 #define IDB_FORMATBAR 101
 
 #define IDI_WORDPAD 102
-#define IDI_RTF 103
-#define IDI_WRI 104
-#define IDI_TXT 105
 
-#define IDC_ZOOM 106
+#define IDC_ZOOM 103
 
 #define STRING_ALL_FILES 1400
 #define STRING_TEXT_FILES_TXT 1401
@@ -222,6 +219,9 @@
 #define STRING_PREVIEW_PAGES 1457
 
 #define STRING_UNITS_CM 1458
+#define STRING_UNITS_IN 1459
+#define STRING_UNITS_INCH 1460
+#define STRING_UNITS_PT 1461
 
 #define STRING_DEFAULT_FILENAME 1700
 #define STRING_PROMPT_SAVE_CHANGES 1701

reactos/base/applications/write/Da.rc

@@ -0,0 +1,29 @@
+/*
+ * Danish language support
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "resources.h"
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    IDS_FAILED, "Kunne ikke starte Wordpad"
+}

reactos/base/applications/write/Es.rc

@@ -0,0 +1,32 @@
+/*
+ * Spanish language support
+ *
+ * Copyright 2010 José Rostagno
+ *
+ * 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 "resources.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_FAILED, "Fallo inicio Wordpad"
+}

reactos/base/applications/write/rsrc.rc

@@ -20,6 +20,7 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+#include "Da.rc"
 #include "En.rc"
 #include "Ko.rc"
 #include "Nl.rc"
@@ -30,6 +31,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* UTF-8 */
 #include "De.rc"
+#include "Es.rc"
 #include "Fr.rc"
 #include "It.rc"
 #include "Ja.rc"

reactos/base/system/msiexec/msiexec.c

@@ -42,36 +42,6 @@ struct string_list
 	WCHAR str[1];
 };
 
-static const char UsageStr[] =
-"Usage:\n"
-"  Install a product:\n"
-"    msiexec {package|productcode} [property]\n"
-"    msiexec /i {package|productcode} [property]\n"
-"    msiexec /package {package|productcode} [property]\n"
-"    msiexec /a package [property]\n"
-"  Repair an installation:\n"
-"    msiexec /f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n"
-"  Uninstall a product:\n"
-"    msiexec /x {package|productcode} [property]\n"
-"  Advertise a product:\n"
-"    msiexec /j[u|m] package [/t transform] [/g languageid]\n"
-"    msiexec {u|m} package [/t transform] [/g languageid]\n"
-"  Apply a patch:\n"
-"    msiexec /p patchpackage [property]\n"
-"    msiexec /p patchpackage /a package [property]\n"
-"  Modifiers for above operations:\n"
-"    msiexec /l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n"
-"    msiexec /q{|n|b|r|f|n+|b+|b-}\n"
-"  Register a module:\n"
-"    msiexec /y module\n"
-"  Unregister a module:\n"
-"    msiexec /z module\n"
-"  Display usage and copyright:\n"
-"    msiexec {/h|/?}\n"
-"NOTE: Product code on commandline unimplemented as of yet\n"
-"\n"
-"Copyright 2004 Vincent Béron\n";
-
 static const WCHAR ActionAdmin[] = {
    'A','C','T','I','O','N','=','A','D','M','I','N',0 };
 static const WCHAR RemoveAll[] = {
@@ -87,8 +57,42 @@ static const WCHAR InstallRunOnce[] = {
 
 static void ShowUsage(int ExitCode)
 {
-	printf(UsageStr);
+    WCHAR msiexec_version[40];
-	ExitProcess(ExitCode);
+    WCHAR filename[MAX_PATH];
+    LPWSTR msi_res;
+    LPWSTR msiexec_help;
+    HMODULE hmsi = GetModuleHandleA("msi.dll");
+    DWORD len;
+    DWORD res;
+
+    /* MsiGetFileVersion need the full path */
+    *filename = 0;
+    res = GetModuleFileNameW(hmsi, filename, sizeof(filename) / sizeof(filename[0]));
+    if (!res)
+        WINE_ERR("GetModuleFileName failed: %d\n", GetLastError());
+
+    len = sizeof(msiexec_version) / sizeof(msiexec_version[0]);
+    *msiexec_version = 0;
+    res = MsiGetFileVersionW(filename, msiexec_version, &len, NULL, NULL);
+    if (res)
+        WINE_ERR("MsiGetFileVersion failed with %d\n", res);
+
+    /* Return the length of the resource.
+       No typo: The LPWSTR parameter must be a LPWSTR * for this mode */
+    len = LoadStringW(hmsi, 10, (LPWSTR) &msi_res, 0);
+
+    msi_res = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR));
+    msiexec_help = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) + sizeof(msiexec_version));
+    if (msi_res && msiexec_help) {
+        *msi_res = 0;
+        LoadStringW(hmsi, 10, msi_res, len + 1);
+
+        sprintfW(msiexec_help, msi_res, msiexec_version);
+        MsiMessageBoxW(0, msiexec_help, NULL, 0, GetUserDefaultLangID(), 0);
+    }
+    HeapFree(GetProcessHeap(), 0, msi_res);
+    HeapFree(GetProcessHeap(), 0, msiexec_help);
+    ExitProcess(ExitCode);
 }
 
 static BOOL IsProductCode(LPWSTR str)
@@ -660,11 +664,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
 			PackageName = argvW[i];
 		}
-		else if(msi_option_prefix(argvW[i], "x"))
+		else if(msi_option_prefix(argvW[i], "x") || msi_option_equal(argvW[i], "uninstall"))
 		{
 			FunctionInstall = TRUE;
-			PackageName = argvW[i]+2;
+			if(msi_option_prefix(argvW[i], "x")) PackageName = argvW[i]+2;
-			if (!PackageName[0])
+			if(!PackageName || !PackageName[0])
 			{
 				i++;
 				if (i >= argc)
@@ -898,7 +902,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
 			DllName = argvW[i];
 		}
-		else if(msi_option_equal(argvW[i], "h") || msi_option_equal(argvW[i], "?"))
+		else if(msi_option_equal(argvW[i], "help") || msi_option_equal(argvW[i], "?"))
 		{
 			ShowUsage(0);
 		}