Skip to content

W
wine-cw
Commit f26c89e8 authored by Alexander Kanavin's avatar Alexander Kanavin Committed by Alexandre Julliard
Browse files
Options

Standard dialog boxes resources and OLE strings are now in cp1251 encoding

Font mapper does not anymore use fonts in -koi8-r encoding Font mapper now recognises fonts in -windows-* encodings (these are provided by xfstt TrueType server) Font mapper now sees max 16384 fonts (was 2048)
parent cd6f5997
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 66 deletions
dlls/shell32/shell32_Ru.rc
View file @ f26c89e8
......@@ -2,13 +2,13 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION " %s"
CAPTION " %s"
FONT 10, "System"
{
DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12, WS_TABSTOP
LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
ICON "", 1088, 189, 10, 14, 16
LTEXT "", 100, 8, 10, 137, 33
LTEXT " Wine :", 98, 8, 55, 137, 10
LTEXT " Wine :", 98, 8, 55, 137, 10
}
graphics/x11drv/xfont.c
View file @ f26c89e8
......@@ -39,7 +39,7 @@ DEFAULT_DEBUG_CHANNEL(font)
#define X_PFONT_MAGIC (0xFADE0000)
#define X_FMC_MAGIC (0x0000CAFE)
#define MAX_FONT_FAMILIES 128
#define MAX_FONT_FAMILIES 1024
#define MAX_LFD_LENGTH 256
#define MAX_FONT_SIZE 1000 /* Max size in pixels */
......@@ -115,9 +115,10 @@ static LPSTR suffx_iso[] = { "-1", "-2", "-3", "-4", "-5", "-6", "-7", "-8",
static LPSTR suffx_iso646[] = { "-irv", NULL };
static LPSTR suffx_microsoft[] = { "-cp1252", "-cp1251", "-cp1250", "-cp1253", "-cp1254", "-cp1255",
"-cp1256", "-cp1257", "-fontspecific", "-symbol", NULL };
static LPSTR suffx_windows[] = { "-1252", "-1251", "-1250", "-1253", "-1254",
"-1256", "-1257", NULL };
static LPSTR suffx_viscii[] = { "-1", NULL };
static LPSTR suffx_ansi[] = { "-0", NULL };
static LPSTR suffx_koi8[] = { "-ru", "-r", NULL };
static LPSTR suffx_null[] = { NULL };
/* charset mapping tables, have to have the same number of entries as corresponding suffix tables */
......@@ -131,7 +132,8 @@ static BYTE chset_microsoft[] = { ANSI_CHARSET, RUSSIAN_CHARSET, EE_CHARSET, GRE
HEBREW_CHARSET, ARABIC_CHARSET, BALTIC_CHARSET, SYMBOL_CHARSET, SYMBOL_CHARSET,
SYMBOL_CHARSET };
static BYTE chset_ansi[] = { ANSI_CHARSET, ANSI_CHARSET };
static BYTE chset_koi8[] = { KOI8_CHARSET, KOI8_CHARSET, KOI8_CHARSET };
static BYTE chset_windows[] = { ANSI_CHARSET, RUSSIAN_CHARSET, EE_CHARSET, GREEK_CHARSET, TURKISH_CHARSET,
HEBREW_CHARSET, ARABIC_CHARSET, BALTIC_CHARSET, BALTIC_CHARSET};
static BYTE chset_tcvn[] = { TCVN_CHARSET, TCVN_CHARSET };
static BYTE chset_tis620[] = { THAI_CHARSET, THAI_CHARSET };
static BYTE chset_fontspecific[] = { SYMBOL_CHARSET };
......@@ -156,7 +158,7 @@ static fontEncodingTemplate __fETTable[10] = {
{ "ansi", &suffx_ansi, &chset_ansi, &__fETTable[4] },
{ "ascii", &suffx_ansi, &chset_ansi, &__fETTable[5] },
{ "fontspecific", &suffx_null, &chset_fontspecific, &__fETTable[6] },
{ "koi8", &suffx_koi8, &chset_koi8, &__fETTable[7] },
{ "windows", &suffx_windows, &chset_windows, &__fETTable[7] },
{ "tcvn", &suffx_ansi, &chset_tcvn, &__fETTable[8] },
{ "tis620.2533", &suffx_ansi, &chset_tis620, &__fETTable[9] },
{ "viscii1.1", &suffx_viscii, &chset_viscii, NULL }
......
ole/nls/rus.nls
View file @ f26c89e8
/*
* OLE2NLS library
* Russia
* (russian strings in koi8-r)
* (russian strings in cp1251)
*/
LOCVAL(LOCALE_ILANGUAGE,"0419")
......@@ -10,10 +10,10 @@ LOCVAL(LOCALE_SENGLANGUAGE,"Russian")
LOCVAL(LOCALE_SABBREVLANGNAME,"rus")
/* LOCVAL(LOCALE_SNATIVELANGNAME,"") */
/* LOCVAL(LOCALE_ICOUNTRY,"") */
LOCVAL(LOCALE_SCOUNTRY,"")
LOCVAL(LOCALE_SCOUNTRY,"")
LOCVAL(LOCALE_SENGCOUNTRY,"Russia")
LOCVAL(LOCALE_SABBREVCTRYNAME,"RUS")
LOCVAL(LOCALE_SNATIVECTRYNAME,"")
LOCVAL(LOCALE_SNATIVECTRYNAME,"")
/* LOCVAL(LOCALE_IDEFAULTLANGUAGE,"") */
/* LOCVAL(LOCALE_IDEFAULTCOUNTRY,"") */
LOCVAL(LOCALE_IDEFAULTCODEPAGE,"866")
......@@ -27,7 +27,7 @@ LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1251")
/* LOCVAL(LOCALE_ILZERO,"1") */
/* LOCVAL(LOCALE_INEGNUMBER) */
LOCVAL(LOCALE_SNATIVEDIGITS,"0123456789")
LOCVAL(LOCALE_SCURRENCY,"")
LOCVAL(LOCALE_SCURRENCY,"")
LOCVAL(LOCALE_SINTLSYMBOL,"RUR")
/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
......@@ -56,48 +56,48 @@ LOCVAL(LOCALE_ICALENDARTYPE, "1")
/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
LOCVAL(LOCALE_SDAYNAME1,"")
LOCVAL(LOCALE_SDAYNAME2,"")
LOCVAL(LOCALE_SDAYNAME3,"")
LOCVAL(LOCALE_SDAYNAME4,"")
LOCVAL(LOCALE_SDAYNAME5,"")
LOCVAL(LOCALE_SDAYNAME6,"")
LOCVAL(LOCALE_SDAYNAME7,"")
LOCVAL(LOCALE_SDAYNAME1,"")
LOCVAL(LOCALE_SDAYNAME2,"")
LOCVAL(LOCALE_SDAYNAME3,"")
LOCVAL(LOCALE_SDAYNAME4,"")
LOCVAL(LOCALE_SDAYNAME5,"")
LOCVAL(LOCALE_SDAYNAME6,"")
LOCVAL(LOCALE_SDAYNAME7,"")
LOCVAL(LOCALE_SABBREVDAYNAME1,"")
LOCVAL(LOCALE_SABBREVDAYNAME2,"")
LOCVAL(LOCALE_SABBREVDAYNAME3,"")
LOCVAL(LOCALE_SABBREVDAYNAME4,"")
LOCVAL(LOCALE_SABBREVDAYNAME5,"")
LOCVAL(LOCALE_SABBREVDAYNAME6,"")
LOCVAL(LOCALE_SABBREVDAYNAME7,"")
LOCVAL(LOCALE_SABBREVDAYNAME1,"")
LOCVAL(LOCALE_SABBREVDAYNAME2,"")
LOCVAL(LOCALE_SABBREVDAYNAME3,"")
LOCVAL(LOCALE_SABBREVDAYNAME4,"")
LOCVAL(LOCALE_SABBREVDAYNAME5,"")
LOCVAL(LOCALE_SABBREVDAYNAME6,"")
LOCVAL(LOCALE_SABBREVDAYNAME7,"")
LOCVAL(LOCALE_SMONTHNAME1,"")
LOCVAL(LOCALE_SMONTHNAME2,"")
LOCVAL(LOCALE_SMONTHNAME3,"")
LOCVAL(LOCALE_SMONTHNAME4,"")
LOCVAL(LOCALE_SMONTHNAME5,"")
LOCVAL(LOCALE_SMONTHNAME6,"")
LOCVAL(LOCALE_SMONTHNAME7,"")
LOCVAL(LOCALE_SMONTHNAME8,"")
LOCVAL(LOCALE_SMONTHNAME9,"")
LOCVAL(LOCALE_SMONTHNAME10,"")
LOCVAL(LOCALE_SMONTHNAME11,"")
LOCVAL(LOCALE_SMONTHNAME12,"")
LOCVAL(LOCALE_SMONTHNAME1,"")
LOCVAL(LOCALE_SMONTHNAME2,"")
LOCVAL(LOCALE_SMONTHNAME3,"")
LOCVAL(LOCALE_SMONTHNAME4,"")
LOCVAL(LOCALE_SMONTHNAME5,"")
LOCVAL(LOCALE_SMONTHNAME6,"")
LOCVAL(LOCALE_SMONTHNAME7,"")
LOCVAL(LOCALE_SMONTHNAME8,"")
LOCVAL(LOCALE_SMONTHNAME9,"")
LOCVAL(LOCALE_SMONTHNAME10,"")
LOCVAL(LOCALE_SMONTHNAME11,"")
LOCVAL(LOCALE_SMONTHNAME12,"")
LOCVAL(LOCALE_SMONTHNAME13,"")
LOCVAL(LOCALE_SABBREVMONTHNAME1,"")
LOCVAL(LOCALE_SABBREVMONTHNAME2,"")
LOCVAL(LOCALE_SABBREVMONTHNAME3,"")
LOCVAL(LOCALE_SABBREVMONTHNAME4,"")
LOCVAL(LOCALE_SABBREVMONTHNAME5,"")
LOCVAL(LOCALE_SABBREVMONTHNAME6,"")
LOCVAL(LOCALE_SABBREVMONTHNAME7,"")
LOCVAL(LOCALE_SABBREVMONTHNAME8,"")
LOCVAL(LOCALE_SABBREVMONTHNAME9,"")
LOCVAL(LOCALE_SABBREVMONTHNAME10,"")
LOCVAL(LOCALE_SABBREVMONTHNAME11,"")
LOCVAL(LOCALE_SABBREVMONTHNAME12,"")
LOCVAL(LOCALE_SABBREVMONTHNAME1,"")
LOCVAL(LOCALE_SABBREVMONTHNAME2,"")
LOCVAL(LOCALE_SABBREVMONTHNAME3,"")
LOCVAL(LOCALE_SABBREVMONTHNAME4,"")
LOCVAL(LOCALE_SABBREVMONTHNAME5,"")
LOCVAL(LOCALE_SABBREVMONTHNAME6,"")
LOCVAL(LOCALE_SABBREVMONTHNAME7,"")
LOCVAL(LOCALE_SABBREVMONTHNAME8,"")
LOCVAL(LOCALE_SABBREVMONTHNAME9,"")
LOCVAL(LOCALE_SABBREVMONTHNAME10,"")
LOCVAL(LOCALE_SABBREVMONTHNAME11,"")
LOCVAL(LOCALE_SABBREVMONTHNAME12,"")
LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
LOCVAL(LOCALE_SPOSITIVESIGN, "")
......
resources/sysres_Ru.rc
View file @ f26c89e8
......@@ -2,17 +2,17 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
{
MENUITEM "&", 61728
MENUITEM "&", 61456
MENUITEM "&", 61440
MENUITEM "&", 61472
MENUITEM "&", 61488
MENUITEM "&", 61728
MENUITEM "&", 61456
MENUITEM "&", 61440
MENUITEM "&", 61472
MENUITEM "&", 61488
MENUITEM SEPARATOR
MENUITEM "&\tAlt-F4", 61536
MENUITEM "&\tAlt-F4", 61536
MENUITEM SEPARATOR
MENUITEM "& ...\tCtrl-Esc", 61744
MENUITEM "& ...\tCtrl-Esc", 61744
MENUITEM SEPARATOR
MENUITEM "& WINE ...", 61761
MENUITEM "& WINE ...", 61761
MENUITEM SEPARATOR
MENUITEM "&Put mark in debug log", 61762
}
......@@ -21,14 +21,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
{
POPUP ""
BEGIN
MENUITEM "&", EM_UNDO
MENUITEM "&", EM_UNDO
MENUITEM SEPARATOR
MENUITEM "&", WM_CUT
MENUITEM "&", WM_COPY
MENUITEM "&", WM_PASTE
MENUITEM "&", WM_CLEAR
MENUITEM "&", WM_CUT
MENUITEM "&", WM_COPY
MENUITEM "&", WM_PASTE
MENUITEM "&", WM_CLEAR
MENUITEM SEPARATOR
MENUITEM " &", EM_SETSEL
MENUITEM " &", EM_SETSEL
END
}
......@@ -38,11 +38,11 @@ BEGIN
ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Abort", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Ignore", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment