- Update wmc to Wine-20081105 (mostly typo fixes).

svn path=/trunk/; revision=37207

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index fb765bc..86a7acf 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -24,7 +24,7 @@ The following build tools are shared with Wine.
 reactos/tools/unicode             # Synced to Wine-20081105 (~Wine-1.1.7)
 reactos/tools/wpp                 # Synced to Wine-20081105 (~Wine-1.1.7)
 reactos/tools/winebuild           # Synced to Wine-20081105 (~Wine-1.1.7)
-reactos/tools/wmc                 # Synced to Wine-20071201
+reactos/tools/wmc                 # Synced to Wine-20081105 (~Wine-1.1.7)
 reactos/tools/wrc                 # Synced to Wine-0_9_53
 reactos/tools/widl                # Synced to Wine-0_9_59
 

diff --git a/reactos/tools/wmc/lang.c b/reactos/tools/wmc/lang.c
index e33a655..b045612 100644 (file)
--- a/reactos/tools/wmc/lang.c
+++ b/reactos/tools/wmc/lang.c
@@ -50,7 +50,7 @@ static const language_t languages[] = {
        {0x0011, 932,  932, "Japanese", NULL},
        {0x0012, 949,  949, "Korean", NULL},
        {0x0013, 850, 1252, "Dutch", NULL},
-       {0x0014, 850, 1252, "Norwegian (Bokmål)", NULL},
+       {0x0014, 850, 1252, "Norwegian (Bokmål)", NULL},
        {0x0015, 852, 1250, "Polish", NULL},
        {0x0016, 850, 1252, "Portuguese", NULL},
        {0x0018, 852, 1250, "Romanian", NULL},
@@ -90,7 +90,7 @@ static const language_t languages[] = {
        {0x0411, 932,  932, "Japanese", "Japan"},
        {0x0412, 949,  949, "Korean", "Korea (south)"},
        {0x0413, 850, 1252, "Dutch", "Netherlands"},
-       {0x0414, 850, 1252, "Norwegian (Bokmål)", "Norway"},
+       {0x0414, 850, 1252, "Norwegian (Bokmål)", "Norway"},
        {0x0415, 852, 1250, "Polish", "Poland"},
        {0x0416, 850, 1252, "Portuguese", "Brazil"},
        {0x0418, 852, 1250, "Romanian", "Romania"},

diff --git a/reactos/tools/wmc/mcl.c b/reactos/tools/wmc/mcl.c
index 380c06c..be01691 100644 (file)
--- a/reactos/tools/wmc/mcl.c
+++ b/reactos/tools/wmc/mcl.c
@@ -33,7 +33,7 @@
 #include "mcy.tab.h"
 
 /*
- * Keywords are case insenitive. All normal input is treated as
+ * Keywords are case insensitive. All normal input is treated as
  * being in codepage iso-8859-1 for ascii input files (unicode
  * page 0) and as equivalent unicode if unicode input is selected.
  * All normal input, which is not part of a message text, is
@@ -205,7 +205,7 @@ try_again:
                if(n < 0)
                        internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n);
                if(n <= 1)
-                       goto try_again; /* Should not hapen */
+                       goto try_again; /* Should not happen */
                n--;    /* Strip added conversion '\0' from input length */
                /*
                 * FIXME:

diff --git a/reactos/tools/wmc/write.c b/reactos/tools/wmc/write.c
index 2e92359..2e4d4e3 100644 (file)
--- a/reactos/tools/wmc/write.c
+++ b/reactos/tools/wmc/write.c
@@ -243,7 +243,7 @@ void write_h_file(const char *fname)
                        cptr = dup_u2c(ndp->u.msg->msgs[idx_en]->cp, ndp->u.msg->msgs[idx_en]->msg);
                        killnl(cptr, 0);
                        killcomment(cptr);
-                       fprintf(fp, "/* Approx. msg: %s */\n", cptr);
+                       fprintf(fp, "/* Approximate msg: %s */\n", cptr);
                        free(cptr);
                        cptr = dup_u2c(WMC_DEFAULT_CODEPAGE, ndp->u.msg->sym);
                        if(ndp->u.msg->cast)
@@ -274,8 +274,7 @@ void write_h_file(const char *fname)
                                internal_error(__FILE__, __LINE__, "Invalid base for number print\n");
                        }
                        free(cptr);
-                       if(cast)
-                               free(cast);
+                       free(cast);
                        break;
                default:
                        internal_error(__FILE__, __LINE__, "Invalid node type %d\n", ndp->type);