Skip to content
Snippets Groups Projects
Commit 3f441677 authored by Martin Fuchs's avatar Martin Fuchs Committed by Alexandre Julliard
Browse files

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

switched to unicode for message strings, so that FormatMessage() now
works.
parent b3332d74
No related branches found
No related tags found
No related merge requests found
......@@ -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 $<
......
......@@ -359,7 +359,10 @@ static char *make_string(WCHAR *uc, int len, int codepage)
b = 0;
}
}
len = (len + 3) & ~3;
if (unicodeout)
len = (len + 1) & ~1;
else
len = (len + 3) & ~3;
for(; i < len; i++)
{
*cptr++ = '\\';
......@@ -467,7 +470,7 @@ static void write_rcinline(FILE *fp)
cptr = make_string(blk->msgs[j]->msg, l, unicodeout ? 0 : blk->msgs[j]->cp);
fprintf(fp, "\n /* Msg 0x%08x */ 0x%04x, 0x000%c,\n",
blk->idlo + j,
(unicodeout ? (l*2+3)&~3 : (l+3)&~3)+4,
(unicodeout ? (l*2+3)&~3 : (l+3)&~3) + 4,
unicodeout ? '1' : '0');
fprintf(fp, "%s%s\n", cptr, comma);
free(cptr);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment