August 2015 - Wine-commits - list.winehq.org

Thomas Faller : cmd: Implement 'echo/'.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 1d09a3587814b6d6e424641a6274d7877f48cd67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d09a3587814b6d6e424641a6… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Aug 18 15:54:43 2015 +0200 cmd: Implement 'echo/'. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ programs/cmd/wcmdmain.c | 7 +++++-- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b124876..5661c69 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1465,7 +1465,7 @@ void WCMD_echo (const WCHAR *args) WCHAR *trimmed; if ( args[0]==' ' || args[0]=='\t' || args[0]=='.' - || args[0]==':' || args[0]==';') + || args[0]==':' || args[0]==';' || args[0]=='/') args++; trimmed = WCMD_strtrim(args); @@ -1473,7 +1473,7 @@ void WCMD_echo (const WCHAR *args) count = strlenW(trimmed); if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':' - && origcommand[0]!=';') { + && origcommand[0]!=';' && origcommand[0]!='/') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); heap_free(trimmed); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5351e9c..0a8a4f4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -15,6 +15,10 @@ echo: echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo off now echo word(a)space@ echo word(a)space@@space@ @@ -47,6 +51,10 @@ echo: echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo on again echo word(a)space@ echo word(a)space@@space@ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4dddc71..b222158 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -42,6 +42,18 @@ word @pwd@>echo :word(a)space@ :word +(a)pwd@>echo/ + + +(a)pwd@>echo /@space@ +/ + +(a)pwd@>echo/word +word + +(a)pwd@>echo /word(a)space@ +/word + @pwd@>echo off now(a)space@ off now @@ -93,6 +105,10 @@ word : word :word + +/ +word +/word on again word(a)space@ word(a)space@@space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1e42c47..7666329 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1853,17 +1853,20 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (context && echo_mode && *curPos && (*curPos != '@')) { static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; + static const WCHAR echoSlash[] = {'e','c','h','o','/'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ - /* Except for lines starting with 'echo.' or 'echo:'. Ask MS why */ + /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, curPos, min_len, echoDot, len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - curPos, min_len, echoCol, len) != CSTR_EQUAL) + curPos, min_len, echoCol, len) != CSTR_EQUAL + && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + curPos, min_len, echoSlash, len) != CSTR_EQUAL) { WCMD_output_asis(spaceW); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 88d49b25c8f67cb76f71957af8c17889fb1e544a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d49b25c8f67cb76f71957af… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Aug 18 20:55:08 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6fb9ff3..7963801 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-07-14 16:31+0300\n" +"PO-Revision-Date: 2015-08-18 20:53+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -198,7 +198,7 @@ msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" msgstr "" -"Nepavyko įvykdyti programos pašalinimo komandos „%s“. Ar norite pašalinti " +"Nepavyko įvykdyti programos šalinimo komandos „%s“. Ar norite pašalinti " "programos šalinimo įrašą iš registro?" #: appwiz.rc:36 @@ -12864,18 +12864,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "šalinimo programa: Programa su GUID „%1“ nerasta\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"šalinimo programa: Už parametro „--remove“ privalo būti programos GUID\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Klaida: netinkamas parametras „%c“.\n" +msgstr "šalinimo programa: Netinkamas parametras [%1]\n" #: view.rc:36 msgid "&Pan"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: ff35d02d7033c0790795e4736d3d860ebeace170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff35d02d7033c0790795e4736… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 19 08:20:07 2015 +0300 po: Update Russian translation. --- po/ru.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2a899c0..dc1935e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,13 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-22 14:01+0300\n" +"PO-Revision-Date: 2015-08-19 08:15+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.6.10\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -12851,18 +12852,18 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: приложение с идентификатором «%1» не найдено\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller: за опцией «--remove» должен следовать GUID идентификатор " +"приложения\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Ошибка: неверная опция «%c».\n" +msgstr "uninstaller: неверная опция [%1]\n" #: view.rc:36 msgid "&Pan"

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: ecd0881ba4a46ef8ca7c56ef95975d95d7f9fbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd0881ba4a46ef8ca7c56ef9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Aug 19 13:58:46 2015 +0300 po: Update Ukrainian translation. --- po/uk.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1d0229f..4c76869 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-08-03 15:12+0200\n" +"PO-Revision-Date: 2015-08-19 13:56+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -12942,18 +12942,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: Застосунок з ідентифікатором '%1' не знайдено\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Помилка: невірний параметр '%c'.\n" +msgstr "uninstaller: Невірний параметр [%1]\n" #: view.rc:36 msgid "&Pan"

1 0

Eric Kohl : advapi32: Add some well-known SDDL SID strings.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 424f010ac194742db220694c48cb709b0514a87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=424f010ac194742db220694c4… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Tue Aug 18 22:32:00 2015 +0200 advapi32: Add some well-known SDDL SID strings. --- dlls/advapi32/security.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index b632577..d1e2bb4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -147,16 +147,16 @@ static const WELLKNOWNRID WellKnownRids[] = { { {'L','A'}, WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, { {'L','G'}, WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, { {0,0}, WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, - { {0,0}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, - { {0,0}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, - { {0,0}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, - { {0,0}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, - { {0,0}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, - { {0,0}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, - { {0,0}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, - { {0,0}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, - { {0,0}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, - { {0,0}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, + { {'D','A'}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { {'D','U'}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { {'D','G'}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { {'D','C'}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { {'D','D'}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { {'C','A'}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { {'S','A'}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { {'E','A'}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { {'P','A'}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { {'R','S'}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, };

1 0

Nikolay Sivov : dwrite: Implement font stretch resolution.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 4a399b76773ddb35c104555e5d938d10092bd7b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a399b76773ddb35c104555e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 18 23:48:44 2015 +0300 dwrite: Implement font stretch resolution. --- dlls/dwrite/font.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 195 insertions(+), 26 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4e9ba27..ec230c8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1982,23 +1982,78 @@ static inline BOOL is_name_separator_char(WCHAR ch) return ch == ' ' || ch == '.' || ch == '-' || ch == '_'; } -static BOOL match_pattern_list(struct list *tokens, const WCHAR **patterns) +struct name_pattern { + const WCHAR *part1; /* NULL indicates end of list */ + const WCHAR *part2; /* optional, if not NULL should point to non-empty string */ +}; + +static BOOL match_pattern_list(struct list *tokens, const struct name_pattern *patterns) { + const struct name_pattern *pattern; struct name_token *token; - const WCHAR *ptr; int i = 0; - while ((ptr = patterns[++i])) { - int len = strlenW(ptr); + while ((pattern = &patterns[++i])->part1) { + int len_part1 = strlenW(pattern->part1); + int len_part2 = pattern->part2 ? strlenW(pattern->part2) : 0; LIST_FOR_EACH_ENTRY(token, tokens, struct name_token, entry) { - if (token->len != len) - continue; + if (len_part2 == 0) { + /* simple case with single part pattern */ + if (token->len != len_part1) + continue; + + if (!strncmpiW(token->ptr, pattern->part1, len_part1)) { + list_remove(&token->entry); + heap_free(token); + return TRUE; + } + } + else { + struct name_token *next_token; + struct list *next_entry; + + /* pattern parts are stored in reading order, tokens list is reversed */ + if (token->len < len_part2) + continue; + + /* it's possible to have combined string as a token, like ExtraCondensed */ + if (token->len == len_part1 + len_part2) { + if (strncmpiW(token->ptr, pattern->part1, len_part1)) + continue; + + if (strncmpiW(&token->ptr[len_part1], pattern->part2, len_part2)) + continue; + + /* combined string match */ + list_remove(&token->entry); + heap_free(token); + return TRUE; + } - if (!strncmpiW(token->ptr, ptr, len)) { - list_remove(&token->entry); - heap_free(token); - return TRUE; + /* now it's only possible to have two tokens matched to respective pattern parts */ + if (token->len != len_part2) + continue; + + next_entry = list_next(tokens, &token->entry); + if (next_entry) { + next_token = LIST_ENTRY(next_entry, struct name_token, entry); + if (next_token->len != len_part1) + continue; + + if (strncmpiW(token->ptr, pattern->part2, len_part2)) + continue; + + if (strncmpiW(next_token->ptr, pattern->part1, len_part1)) + continue; + + /* both parts matched, remove tokens */ + list_remove(&token->entry); + list_remove(&next_token->entry); + heap_free(next_token); + heap_free(token); + return TRUE; + } } } } @@ -2020,22 +2075,22 @@ static DWRITE_FONT_STYLE font_extract_style(struct list *tokens, DWRITE_FONT_STY static const WCHAR backslantW[] = {'b','a','c','k','s','l','a','n','t',0}; static const WCHAR slantedW[] = {'s','l','a','n','t','e','d',0}; - static const WCHAR *italic_patterns[] = { - itaW, - italW, - italicW, - cursiveW, - kursivW, - NULL + static const struct name_pattern italic_patterns[] = { + { itaW }, + { italW }, + { italicW }, + { cursiveW }, + { kursivW }, + { NULL } }; - static const WCHAR *oblique_patterns[] = { - inclinedW, - obliqueW, - backslantedW, - backslantW, - slantedW, - NULL + static const struct name_pattern oblique_patterns[] = { + { inclinedW }, + { obliqueW }, + { backslantedW }, + { backslantW }, + { slantedW }, + { NULL } }; /* italic patterns first */ @@ -2049,6 +2104,108 @@ static DWRITE_FONT_STYLE font_extract_style(struct list *tokens, DWRITE_FONT_STY return style; } +static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT_STRETCH stretch) +{ + static const WCHAR compressedW[] = {'c','o','m','p','r','e','s','s','e','d',0}; + static const WCHAR condensedW[] = {'c','o','n','d','e','n','s','e','d',0}; + static const WCHAR expandedW[] = {'e','x','p','a','n','d','e','d',0}; + static const WCHAR extendedW[] = {'e','x','t','e','n','d','e','d',0}; + static const WCHAR compactW[] = {'c','o','m','p','a','c','t',0}; + static const WCHAR narrowW[] = {'n','a','r','r','o','w',0}; + static const WCHAR wideW[] = {'w','i','d','e',0}; + /* modifiers */ + static const WCHAR extraW[] = {'e','x','t','r','a',0}; + static const WCHAR ultraW[] = {'u','l','t','r','a',0}; + static const WCHAR condW[] = {'c','o','n','d',0}; + static const WCHAR extW[] = {'e','x','t',0}; + static const WCHAR semiW[] = {'s','e','m','i',0}; + + static const struct name_pattern ultracondensed_patterns[] = { + { extraW, compressedW }, + { extW, compressedW }, + { ultraW, compressedW }, + { ultraW, condensedW }, + { ultraW, condW }, + { NULL } + }; + + static const struct name_pattern extracondensed_patterns[] = { + { compressedW }, + { extraW, condensedW }, + { extW, condensedW }, + { extraW, condW }, + { extW, condW }, + { NULL } + }; + + static const struct name_pattern semicondensed_patterns[] = { + { narrowW }, + { compactW }, + { semiW, condensedW }, + { semiW, condW }, + { NULL } + }; + + static const struct name_pattern semiexpanded_patterns[] = { + { wideW }, + { semiW, expandedW }, + { semiW, extendedW }, + { NULL } + }; + + static const struct name_pattern extraexpanded_patterns[] = { + { extraW, expandedW }, + { extW, expandedW }, + { extraW, extendedW }, + { extW, extendedW }, + { NULL } + }; + + static const struct name_pattern ultraexpanded_patterns[] = { + { ultraW, expandedW }, + { ultraW, extendedW }, + { NULL } + }; + + static const struct name_pattern condensed_patterns[] = { + { condensedW }, + { condW }, + { NULL } + }; + + static const struct name_pattern expanded_patterns[] = { + { expandedW }, + { extendedW }, + { NULL } + }; + + if (match_pattern_list(tokens, ultracondensed_patterns)) + return DWRITE_FONT_STRETCH_ULTRA_CONDENSED; + + if (match_pattern_list(tokens, extracondensed_patterns)) + return DWRITE_FONT_STRETCH_EXTRA_CONDENSED; + + if (match_pattern_list(tokens, semicondensed_patterns)) + return DWRITE_FONT_STRETCH_SEMI_CONDENSED; + + if (match_pattern_list(tokens, semiexpanded_patterns)) + return DWRITE_FONT_STRETCH_SEMI_EXPANDED; + + if (match_pattern_list(tokens, extraexpanded_patterns)) + return DWRITE_FONT_STRETCH_EXTRA_EXPANDED; + + if (match_pattern_list(tokens, ultraexpanded_patterns)) + return DWRITE_FONT_STRETCH_ULTRA_EXPANDED; + + if (match_pattern_list(tokens, condensed_patterns)) + return DWRITE_FONT_STRETCH_CONDENSED; + + if (match_pattern_list(tokens, expanded_patterns)) + return DWRITE_FONT_STRETCH_EXPANDED; + + return stretch; +} + static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHAR *familyW, WCHAR *faceW) { static const WCHAR bookW[] = {'B','o','o','k',0}; @@ -2066,6 +2223,7 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA NULL }; + DWRITE_FONT_STRETCH stretch = font->stretch; static const WCHAR spaceW[] = {' ',0}; WCHAR familynameW[255], facenameW[255]; struct name_token *token, *token2; @@ -2129,13 +2287,24 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA /* extract and resolve style */ font->style = font_extract_style(&tokens, font->style); - /* TODO: extract stretch */ + /* extract stretch */ + stretch = font_extract_stretch(&tokens, font->stretch); /* TODO: extract weight */ /* TODO: resolve weight */ - /* TODO: resolve stretch */ + /* Resolve stretch - extracted stretch can't be normal, it will override specified stretch if + it's leaning in opposite direction from normal comparing to specified stretch or if specified + stretch itself is normal (extracted stretch is never normal). */ + if (stretch != font->stretch) { + if ((font->stretch == DWRITE_FONT_STRETCH_NORMAL) || + (font->stretch < DWRITE_FONT_STRETCH_NORMAL && stretch > DWRITE_FONT_STRETCH_NORMAL) || + (font->stretch > DWRITE_FONT_STRETCH_NORMAL && stretch < DWRITE_FONT_STRETCH_NORMAL)) { + + font->stretch = stretch; + } + } /* release tokens */ LIST_FOR_EACH_ENTRY_SAFE(token, token2, &tokens, struct name_token, entry) {

1 0

Nikolay Sivov : dwrite: Extract and resolve font weight from name string.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 6b98b9ac700c133e7783e81257aa23a133c7d527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b98b9ac700c133e7783e8125… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 18 23:49:24 2015 +0300 dwrite: Extract and resolve font weight from name string. --- dlls/dwrite/font.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 156 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ec230c8..7e88a2f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -42,6 +42,12 @@ static const FLOAT RECOMMENDED_OUTLINE_AA_THRESHOLD = 100.0f; static const FLOAT RECOMMENDED_OUTLINE_A_THRESHOLD = 350.0f; static const FLOAT RECOMMENDED_NATURAL_PPEM = 20.0f; +/* common modifiers used in names */ +static const WCHAR extraW[] = {'e','x','t','r','a',0}; +static const WCHAR ultraW[] = {'u','l','t','r','a',0}; +static const WCHAR semiW[] = {'s','e','m','i',0}; +static const WCHAR extW[] = {'e','x','t',0}; + struct dwrite_font_propvec { FLOAT stretch; FLOAT style; @@ -2113,12 +2119,7 @@ static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT static const WCHAR compactW[] = {'c','o','m','p','a','c','t',0}; static const WCHAR narrowW[] = {'n','a','r','r','o','w',0}; static const WCHAR wideW[] = {'w','i','d','e',0}; - /* modifiers */ - static const WCHAR extraW[] = {'e','x','t','r','a',0}; - static const WCHAR ultraW[] = {'u','l','t','r','a',0}; static const WCHAR condW[] = {'c','o','n','d',0}; - static const WCHAR extW[] = {'e','x','t',0}; - static const WCHAR semiW[] = {'s','e','m','i',0}; static const struct name_pattern ultracondensed_patterns[] = { { extraW, compressedW }, @@ -2206,6 +2207,135 @@ static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT return stretch; } +static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_WEIGHT weight) +{ + static const WCHAR mediumW[] = {'m','e','d','i','u','m',0}; + static const WCHAR blackW[] = {'b','l','a','c','k',0}; + static const WCHAR heavyW[] = {'h','e','a','v','y',0}; + static const WCHAR lightW[] = {'l','i','g','h','t',0}; + static const WCHAR boldW[] = {'b','o','l','d',0}; + static const WCHAR demiW[] = {'d','e','m','i',0}; + static const WCHAR thinW[] = {'t','h','i','n',0}; + static const WCHAR nordW[] = {'n','o','r','d',0}; + + static const struct name_pattern thin_patterns[] = { + { extraW, thinW }, + { extW, thinW }, + { ultraW, thinW }, + { NULL } + }; + + static const struct name_pattern extralight_patterns[] = { + { extraW, lightW }, + { extW, lightW }, + { ultraW, lightW }, + { NULL } + }; + + static const struct name_pattern demibold_patterns[] = { + { semiW, boldW }, + { demiW, boldW }, + { NULL } + }; + + static const struct name_pattern extrabold_patterns[] = { + { extraW, boldW }, + { extW, boldW }, + { ultraW, boldW }, + { NULL } + }; + + static const struct name_pattern extrablack_patterns[] = { + { extraW, blackW }, + { extW, blackW }, + { ultraW, blackW }, + { NULL } + }; + + static const struct name_pattern bold_patterns[] = { + { boldW }, + { NULL } + }; + + static const struct name_pattern thin2_patterns[] = { + { thinW }, + { NULL } + }; + + static const struct name_pattern light_patterns[] = { + { lightW }, + { NULL } + }; + + static const struct name_pattern medium_patterns[] = { + { mediumW }, + { NULL } + }; + + static const struct name_pattern black_patterns[] = { + { blackW }, + { heavyW }, + { nordW }, + { NULL } + }; + + static const struct name_pattern demibold2_patterns[] = { + { demiW }, + { NULL } + }; + + static const struct name_pattern extrabold2_patterns[] = { + { ultraW }, + { NULL } + }; + + /* FIXME: allow optional 'face' suffix, separated or not. It's removed together with + matching pattern. */ + + if (match_pattern_list(tokens, thin_patterns)) + return DWRITE_FONT_WEIGHT_THIN; + + if (match_pattern_list(tokens, extralight_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_LIGHT; + + if (match_pattern_list(tokens, demibold_patterns)) + return DWRITE_FONT_WEIGHT_DEMI_BOLD; + + if (match_pattern_list(tokens, extrabold_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_BOLD; + + if (match_pattern_list(tokens, extrablack_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_BLACK; + + if (match_pattern_list(tokens, bold_patterns)) + return DWRITE_FONT_WEIGHT_BOLD; + + if (match_pattern_list(tokens, thin2_patterns)) + return DWRITE_FONT_WEIGHT_THIN; + + if (match_pattern_list(tokens, light_patterns)) + return DWRITE_FONT_WEIGHT_LIGHT; + + if (match_pattern_list(tokens, medium_patterns)) + return DWRITE_FONT_WEIGHT_MEDIUM; + + if (match_pattern_list(tokens, black_patterns)) + return DWRITE_FONT_WEIGHT_BLACK; + + if (match_pattern_list(tokens, black_patterns)) + return DWRITE_FONT_WEIGHT_BLACK; + + if (match_pattern_list(tokens, demibold2_patterns)) + return DWRITE_FONT_WEIGHT_DEMI_BOLD; + + if (match_pattern_list(tokens, extrabold2_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_BOLD; + + /* FIXME: use abbreviated names to extract weight */ + + return weight; +} + static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHAR *familyW, WCHAR *faceW) { static const WCHAR bookW[] = {'B','o','o','k',0}; @@ -2223,10 +2353,11 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA NULL }; - DWRITE_FONT_STRETCH stretch = font->stretch; static const WCHAR spaceW[] = {' ',0}; WCHAR familynameW[255], facenameW[255]; struct name_token *token, *token2; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_WEIGHT weight; BOOL found = FALSE; struct list tokens; const WCHAR *ptr; @@ -2290,9 +2421,23 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA /* extract stretch */ stretch = font_extract_stretch(&tokens, font->stretch); - /* TODO: extract weight */ - - /* TODO: resolve weight */ + /* extract weight */ + weight = font_extract_weight(&tokens, font->weight); + + /* resolve weight */ + if (weight != font->weight) { + if (!(weight < DWRITE_FONT_WEIGHT_NORMAL && font->weight < DWRITE_FONT_WEIGHT_NORMAL) && + !(weight > DWRITE_FONT_WEIGHT_MEDIUM && font->weight > DWRITE_FONT_WEIGHT_MEDIUM) && + !((weight == DWRITE_FONT_WEIGHT_NORMAL && font->weight == DWRITE_FONT_WEIGHT_MEDIUM) || + (weight == DWRITE_FONT_WEIGHT_MEDIUM && font->weight == DWRITE_FONT_WEIGHT_NORMAL)) && + !(abs(weight - font->weight) <= 150 && + font->weight != DWRITE_FONT_WEIGHT_NORMAL && + font->weight != DWRITE_FONT_WEIGHT_MEDIUM && + font->weight != DWRITE_FONT_WEIGHT_BOLD)) { + + font->weight = weight; + } + } /* Resolve stretch - extracted stretch can't be normal, it will override specified stretch if it's leaning in opposite direction from normal comparing to specified stretch or if specified @@ -2306,6 +2451,8 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA } } + /* FIXME: cleanup face name from possible 2-3 digit prefixes, compose final family/face names */ + /* release tokens */ LIST_FOR_EACH_ENTRY_SAFE(token, token2, &tokens, struct name_token, entry) { list_remove(&token->entry);

1 0

Nikolay Sivov : dwrite: Protect from space-only strings when trimming away spaces.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 1f54400bbf35de4f892468b78544951c3dc8f968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f54400bbf35de4f892468b78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 18 23:49:50 2015 +0300 dwrite: Protect from space-only strings when trimming away spaces. --- dlls/dwrite/font.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7e88a2f..a0596ea 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1967,7 +1967,10 @@ static int trim_spaces(WCHAR *in, WCHAR *ret) while (isspaceW(*in)) in++; - len = strlenW(in); + ret[0] = 0; + if (!(len = strlenW(in))) + return 0; + while (isspaceW(in[len-1])) len--;

1 0

Vincent Povirk : comdlg32: Implement SetControlItemState for menu controls.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 068a6c7a5f3c93988e5453c1357a33e2e3c93e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=068a6c7a5f3c93988e5453c13… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 14:43:56 2015 -0500 comdlg32: Implement SetControlItemState for menu controls. This required some rethinking because menus and combo boxes don't provide a way to "hide" items, just remove them, and native always shows items in the order they were added even when hidden and shown. --- dlls/comdlg32/itemdlg.c | 195 +++++++++++++++++++++++++++++++++++++++--- dlls/comdlg32/tests/itemdlg.c | 16 ++-- 2 files changed, 193 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=068a6c7a5f3c93988e545…

1 0

Vincent Povirk : comdlg32: Implement SetControlItemState for combo boxes.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 8d8e75849f9f342d3c48cbac6709a7ffc2d36d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8e75849f9f342d3c48cbac6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 15:13:45 2015 -0500 comdlg32: Implement SetControlItemState for combo boxes. --- dlls/comdlg32/itemdlg.c | 59 +++++++++++++++++++++++++++++++++---------- dlls/comdlg32/tests/itemdlg.c | 2 -- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 72f32e1..1ed317a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3675,9 +3675,11 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddControlItem(IFileDialogCustomize case IDLG_CCTRL_COMBOBOX: { UINT index; + cctrl_item* item; - if(get_combobox_index_from_id(ctrl->hwnd, dwIDItem) != -1) - return E_INVALIDARG; + hr = add_item(ctrl, dwIDItem, pszLabel, &item); + + if (FAILED(hr)) return hr; index = SendMessageW(ctrl->hwnd, CB_ADDSTRING, 0, (LPARAM)pszLabel); SendMessageW(ctrl->hwnd, CB_SETITEMDATA, index, dwIDItem); @@ -3719,19 +3721,21 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom { case IDLG_CCTRL_COMBOBOX: { - UINT i, count = SendMessageW(ctrl->hwnd, CB_GETCOUNT, 0, 0); - if(!count || (count == CB_ERR)) - return E_FAIL; + cctrl_item* item; + DWORD position; - for(i = 0; i < count; i++) - if(SendMessageW(ctrl->hwnd, CB_GETITEMDATA, i, 0) == dwIDItem) - { - if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, i, 0) == CB_ERR) - return E_FAIL; - return S_OK; - } + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE|CDCS_ENABLED, &position); - return E_UNEXPECTED; + if ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)) + { + if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, position, 0) == CB_ERR) + return E_FAIL; + } + + list_remove(&item->entry); + item_free(item); + + return S_OK; } case IDLG_CCTRL_MENU: { @@ -3788,6 +3792,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlItemState(IFileDialogCust switch(ctrl->type) { + case IDLG_CCTRL_COMBOBOX: case IDLG_CCTRL_MENU: { cctrl_item* item; @@ -3821,6 +3826,34 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCust switch(ctrl->type) { + case IDLG_CCTRL_COMBOBOX: + { + cctrl_item* item; + BOOL visible, was_visible; + DWORD position; + + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE|CDCS_ENABLED, &position); + + if (!item) + return E_UNEXPECTED; + + visible = ((dwState & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)); + was_visible = ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)); + + if (visible && !was_visible) + { + SendMessageW(ctrl->hwnd, CB_INSERTSTRING, position, (LPARAM)item->label); + SendMessageW(ctrl->hwnd, CB_SETITEMDATA, position, dwIDItem); + } + else if (!visible && was_visible) + { + SendMessageW(ctrl->hwnd, CB_DELETESTRING, position, 0); + } + + item->cdcstate = dwState; + + return S_OK; + } case IDLG_CCTRL_MENU: { TBBUTTON tbb; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 2a604ec..1897178 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1970,7 +1970,6 @@ static void test_customize(void) ok(hr == E_FAIL, "got 0x%08x.\n", hr); ok(selected == -1, "got %d.\n", selected); - todo_wine { cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -1987,7 +1986,6 @@ static void test_customize(void) hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); - } for(j = 0; j < 10; j++) {

1 0