Corrected the alignment of unicode message table strings in wmc, and

switched to unicode for message strings, so that FormatMessage() now
works.

Make.rules.in

@@ -117,7 +117,7 @@ LINTS  = $(C_SRCS:.c=.ln)
 	$(AS) -o $@ $<
 
 .mc.mc.rc:
-	$(LDPATH) $(WMC) -i -H /dev/null -o $@ $<
+	$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
 
 .rc.res:
 	$(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<

tools/wmc/write.c

@@ -359,6 +359,9 @@ static char *make_string(WCHAR *uc, int len, int codepage)
 				b = 0;
 			}
 		}
+		if (unicodeout)
+		    len = (len + 1) & ~1;
+		else
 		    len = (len + 3) & ~3;
 		for(; i < len; i++)
 		{