* rcparse.y (styles): use SUBLANG_SHIFT instead of 8 (or the more
correct 10). * resrc.c (write_rc_resource): Likewise. * windres.h (SUBLANG_SHIFT): Define - as 10.
This commit is contained in:
parent
5b5d0a9784
commit
95fd336c5c
4 changed files with 14 additions and 5 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2001-07-16 DJ Delorie <dj@redhat.com>
|
||||||
|
|
||||||
|
* rcparse.y (styles): use SUBLANG_SHIFT instead of 8 (or the more
|
||||||
|
correct 10).
|
||||||
|
* resrc.c (write_rc_resource): Likewise.
|
||||||
|
* windres.h (SUBLANG_SHIFT): Define - as 10.
|
||||||
|
|
||||||
2001-07-15 Nick Clifton <nickc@cambridge.redhat.com>
|
2001-07-15 Nick Clifton <nickc@cambridge.redhat.com>
|
||||||
|
|
||||||
* MAINTAINERS: Add Christian Groessler as maintainer for z8k port.
|
* MAINTAINERS: Add Christian Groessler as maintainer for z8k port.
|
||||||
|
|
|
@ -455,7 +455,7 @@ styles:
|
||||||
}
|
}
|
||||||
| styles LANGUAGE numexpr cnumexpr
|
| styles LANGUAGE numexpr cnumexpr
|
||||||
{
|
{
|
||||||
sub_res_info.language = $3 | ($4 << 8);
|
sub_res_info.language = $3 | ($4 << SUBLANG_SHIFT);
|
||||||
}
|
}
|
||||||
| styles VERSIONK numexpr
|
| styles VERSIONK numexpr
|
||||||
{
|
{
|
||||||
|
@ -874,7 +874,7 @@ icon:
|
||||||
language:
|
language:
|
||||||
LANGUAGE numexpr cnumexpr
|
LANGUAGE numexpr cnumexpr
|
||||||
{
|
{
|
||||||
language = $2 | ($3 << 8);
|
language = $2 | ($3 << SUBLANG_SHIFT);
|
||||||
}
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -1329,7 +1329,7 @@ suboptions:
|
||||||
| suboptions LANGUAGE numexpr cnumexpr
|
| suboptions LANGUAGE numexpr cnumexpr
|
||||||
{
|
{
|
||||||
$$ = $1;
|
$$ = $1;
|
||||||
$$.language = $3 | ($4 << 8);
|
$$.language = $3 | ($4 << SUBLANG_SHIFT);
|
||||||
}
|
}
|
||||||
| suboptions VERSIONK numexpr
|
| suboptions VERSIONK numexpr
|
||||||
{
|
{
|
||||||
|
|
|
@ -1889,8 +1889,8 @@ write_rc_resource (e, type, name, res, language)
|
||||||
if (res->res_info.language != 0 && res->res_info.language != *language)
|
if (res->res_info.language != 0 && res->res_info.language != *language)
|
||||||
fprintf (e, "%sLANGUAGE %d, %d\n",
|
fprintf (e, "%sLANGUAGE %d, %d\n",
|
||||||
modifiers ? "// " : "",
|
modifiers ? "// " : "",
|
||||||
res->res_info.language & 0xff,
|
res->res_info.language & ((1<<SUBLANG_SHIFT)-1),
|
||||||
(res->res_info.language >> 8) & 0xff);
|
(res->res_info.language >> SUBLANG_SHIFT) & 0xff);
|
||||||
if (res->res_info.characteristics != 0)
|
if (res->res_info.characteristics != 0)
|
||||||
fprintf (e, "%sCHARACTERISTICS %lu\n",
|
fprintf (e, "%sCHARACTERISTICS %lu\n",
|
||||||
modifiers ? "// " : "",
|
modifiers ? "// " : "",
|
||||||
|
|
|
@ -184,6 +184,8 @@ struct res_resource
|
||||||
struct res_coff_info coff_info;
|
struct res_coff_info coff_info;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define SUBLANG_SHIFT 10
|
||||||
|
|
||||||
/* Memory flags in the memflags field of a struct res_resource. */
|
/* Memory flags in the memflags field of a struct res_resource. */
|
||||||
|
|
||||||
#define MEMFLAG_MOVEABLE 0x10
|
#define MEMFLAG_MOVEABLE 0x10
|
||||||
|
|
Loading…
Add table
Reference in a new issue