Remove consolidated defines and code. (BUILD_WCHAR_T, BYTE1, BYTE2): Macros removed; callers changed to use STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2 instead. (w32_per_char_metric): Change font_type arg to int for RIF. (w32_encode_char): Return int according to RIF requirements. (w32_compute_glyph_string_overhangs): Adapt to RIF. (w32_get_glyph_overhangs): New function for RIF. Uses generic x_get_glyph_overhangs. (w32_redisplay_interface): Add new members.