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

Nikolay Sivov : dwrite: Implement font stretch resolution.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

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

Vincent Povirk : comdlg32: Implement SetControlItemState for menu controls.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

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

Michael Müller : winecfg: Do not overwrite theme each time an item is drawn.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 130c655e2fa0fd7d1bf0dc385ea1511a2572834b URL: http://source.winehq.org/git/wine.git/?a=commit;h=130c655e2fa0fd7d1bf0dc385… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Aug 19 06:24:19 2015 +0200 winecfg: Do not overwrite theme each time an item is drawn. --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 8bc3c88..1f4818b 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1094,7 +1094,7 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) HTHEME theme; RECT buttonrect; - theme = OpenThemeData(draw_info->hwndItem, WC_BUTTONW); + theme = OpenThemeData(NULL, WC_BUTTONW); if (theme) { MARGINS margins;

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

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

Dmitry Timoshkov : advapi32/tests: Add a test to show that PROCESS_QUERY_INFORMATION should implicitly grant PROCESS_QUERY_LIMITED_INFORMATION access.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 9e22949cec82f05938fcca9c41948fdbeb0d14aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e22949cec82f05938fcca9c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 19 12:23:33 2015 +0800 advapi32/tests: Add a test to show that PROCESS_QUERY_INFORMATION should implicitly grant PROCESS_QUERY_LIMITED_INFORMATION access. --- dlls/advapi32/tests/security.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index af61acb..70aa949 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5567,6 +5567,16 @@ static void test_process_access(void) CloseHandle(dup); } + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), process, GetCurrentProcess(), &dup, + PROCESS_QUERY_INFORMATION, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + access = get_obj_access(dup); + ok(access == (PROCESS_QUERY_INFORMATION | PROCESS_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == PROCESS_QUERY_INFORMATION /* before Vista */, + "expected PROCESS_QUERY_INFORMATION|PROCESS_QUERY_LIMITED_INFORMATION, got %#x\n", access); + CloseHandle(dup); + TerminateProcess(process, 0); CloseHandle(process); }

1 0

Dmitry Timoshkov : advapi32/tests: Fix compilation with PSDK.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 8a088d7c2f755345728ea9067d0bf43b4f9bc2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a088d7c2f755345728ea9067… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 19 12:23:22 2015 +0800 advapi32/tests: Fix compilation with PSDK. --- dlls/advapi32/tests/security.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 098fa8f..af61acb 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -130,6 +130,8 @@ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,P static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN); static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); +static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); +static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static HMODULE hmod; static int myARGC; @@ -160,6 +162,8 @@ static void init(void) pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); + pRtlInitAnsiString = (void *)GetProcAddress(hntdll, "RtlInitAnsiString"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); hmod = GetModuleHandleA("advapi32.dll"); pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); @@ -3101,7 +3105,8 @@ static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) ANSI_STRING str; NTSTATUS status; BOOLEAN ret; - RtlInitAnsiString(&str, name); + + pRtlInitAnsiString(&str, name); status = pRtlAnsiStringToUnicodeString(&strW, &str, TRUE); ok(!status, "RtlAnsiStringToUnicodeString failed with %08x\n", status); @@ -3109,7 +3114,7 @@ static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) ret = pRtlDosPathNameToNtPathName_U(strW.Buffer, nameW, NULL, NULL); ok(ret, "RtlDosPathNameToNtPathName_U failed\n"); - RtlFreeUnicodeString(&strW); + pRtlFreeUnicodeString(&strW); } static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD flags, DWORD mask, @@ -3349,7 +3354,7 @@ static void test_CreateDirectoryA(void) status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); ok(!status, "NtCreateFile failed with %08x\n", status); - RtlFreeUnicodeString(&tmpfileW); + pRtlFreeUnicodeString(&tmpfileW); error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, @@ -3384,7 +3389,7 @@ static void test_CreateDirectoryA(void) status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); ok(!status, "NtCreateFile failed with %08x\n", status); - RtlFreeUnicodeString(&tmpfileW); + pRtlFreeUnicodeString(&tmpfileW); HeapFree(GetProcessHeap(), 0, pDacl); error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT,

1 0

Vincent Povirk : comdlg32: Partially implement IFileDialogCustomize:: EnableOpenDropDown.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: d3163241afcbe6fd7b10a7de44388a80cc15119c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3163241afcbe6fd7b10a7de4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 15:40:42 2015 -0500 comdlg32: Partially implement IFileDialogCustomize::EnableOpenDropDown. This builds a menu but cannot display it yet. --- dlls/comdlg32/itemdlg.c | 84 ++++++++++++++++++++++++++++++++++--------- dlls/comdlg32/tests/itemdlg.c | 41 +++++++++++---------- 2 files changed, 91 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3163241afcbe6fd7b10a…

1 0

Carlo Bramini : msvcrt: SEEK_* macros from GLIBC should be replaced with safer MSVCRT_SEEK_* macros.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 21a14e9612e10bd1427fa044512c736434d34f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a14e9612e10bd1427fa0445… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Tue Aug 18 12:55:12 2015 +0200 msvcrt: SEEK_* macros from GLIBC should be replaced with safer MSVCRT_SEEK_* macros. --- dlls/msvcrt/file.c | 40 ++++++++++++++++++++-------------------- dlls/msvcrt/msvcrt.h | 4 ++++ 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6cace71..f304ec4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1224,9 +1224,9 @@ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) TRACE(":fd (%d) to %s pos %s\n", fd,wine_dbgstr_longlong(offset), - (whence==SEEK_SET)?"SEEK_SET": - (whence==SEEK_CUR)?"SEEK_CUR": - (whence==SEEK_END)?"SEEK_END":"UNKNOWN"); + (whence==MSVCRT_SEEK_SET)?"SEEK_SET": + (whence==MSVCRT_SEEK_CUR)?"SEEK_CUR": + (whence==MSVCRT_SEEK_END)?"SEEK_END":"UNKNOWN"); /* The MoleBox protection scheme expects msvcrt to use SetFilePointer only, * so a LARGE_INTEGER offset cannot be passed directly via SetFilePointerEx. */ @@ -1357,8 +1357,8 @@ int CDECL MSVCRT__fseeki64_nolock(MSVCRT_FILE* file, __int64 offset, int whence) { int ret; - if(whence == SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { - whence = SEEK_SET; + if(whence == MSVCRT_SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { + whence = MSVCRT_SEEK_SET; offset += MSVCRT__ftelli64_nolock(file); } @@ -1409,10 +1409,10 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size) if (info->handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = MSVCRT__lseeki64(fd, 0, SEEK_CUR); + cur = MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_CUR); if (cur >= 0) { - pos = MSVCRT__lseeki64(fd, size, SEEK_SET); + pos = MSVCRT__lseeki64(fd, size, MSVCRT_SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(info->handle); @@ -1420,7 +1420,7 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size) } /* restore the file pointer */ - MSVCRT__lseeki64(fd, cur, SEEK_SET); + MSVCRT__lseeki64(fd, cur, MSVCRT_SEEK_SET); } } @@ -1457,7 +1457,7 @@ void CDECL MSVCRT_rewind(MSVCRT_FILE* file) TRACE(":file (%p) fd (%d)\n",file,file->_file); MSVCRT__lock_file(file); - MSVCRT__fseek_nolock(file, 0L, SEEK_SET); + MSVCRT__fseek_nolock(file, 0L, MSVCRT_SEEK_SET); MSVCRT_clearerr(file); MSVCRT__unlock_file(file); } @@ -1623,14 +1623,14 @@ MSVCRT_FILE* CDECL MSVCRT__wfdopen(int fd, const MSVCRT_wchar_t *mode) */ LONG CDECL MSVCRT__filelength(int fd) { - LONG curPos = MSVCRT__lseek(fd, 0, SEEK_CUR); + LONG curPos = MSVCRT__lseek(fd, 0, MSVCRT_SEEK_CUR); if (curPos != -1) { - LONG endPos = MSVCRT__lseek(fd, 0, SEEK_END); + LONG endPos = MSVCRT__lseek(fd, 0, MSVCRT_SEEK_END); if (endPos != -1) { if (endPos != curPos) - MSVCRT__lseek(fd, curPos, SEEK_SET); + MSVCRT__lseek(fd, curPos, MSVCRT_SEEK_SET); return endPos; } } @@ -1642,14 +1642,14 @@ LONG CDECL MSVCRT__filelength(int fd) */ __int64 CDECL MSVCRT__filelengthi64(int fd) { - __int64 curPos = MSVCRT__lseeki64(fd, 0, SEEK_CUR); + __int64 curPos = MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_CUR); if (curPos != -1) { - __int64 endPos = MSVCRT__lseeki64(fd, 0, SEEK_END); + __int64 endPos = MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_END); if (endPos != -1) { if (endPos != curPos) - MSVCRT__lseeki64(fd, curPos, SEEK_SET); + MSVCRT__lseeki64(fd, curPos, MSVCRT_SEEK_SET); return endPos; } } @@ -3145,7 +3145,7 @@ int CDECL MSVCRT__wstat64i32(const MSVCRT_wchar_t *path, struct MSVCRT__stat64i3 */ MSVCRT_long CDECL MSVCRT__tell(int fd) { - return MSVCRT__lseek(fd, 0, SEEK_CUR); + return MSVCRT__lseek(fd, 0, MSVCRT_SEEK_CUR); } /********************************************************************* @@ -3153,7 +3153,7 @@ MSVCRT_long CDECL MSVCRT__tell(int fd) */ __int64 CDECL _telli64(int fd) { - return MSVCRT__lseeki64(fd, 0, SEEK_CUR); + return MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_CUR); } /********************************************************************* @@ -4415,7 +4415,7 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } - ret = (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + ret = (MSVCRT__lseeki64(file->_file,*pos,MSVCRT_SEEK_SET) == -1) ? -1 : 0; MSVCRT__unlock_file(file); return ret; } @@ -4456,7 +4456,7 @@ __int64 CDECL MSVCRT__ftelli64_nolock(MSVCRT_FILE* file) pos++; } } else if(!file->_cnt) { /* nothing to do */ - } else if(MSVCRT__lseeki64(file->_file, 0, SEEK_END)==pos) { + } else if(MSVCRT__lseeki64(file->_file, 0, MSVCRT_SEEK_END)==pos) { int i; pos -= file->_cnt; @@ -4468,7 +4468,7 @@ __int64 CDECL MSVCRT__ftelli64_nolock(MSVCRT_FILE* file) } else { char *p; - if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos) + if(MSVCRT__lseeki64(file->_file, pos, MSVCRT_SEEK_SET) != pos) return -1; pos -= file->_bufsiz; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 88f35b3..8c07b94 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -666,6 +666,10 @@ struct MSVCRT__stat64 { #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_BUFSIZ 512 +#define MSVCRT_SEEK_SET 0 +#define MSVCRT_SEEK_CUR 1 +#define MSVCRT_SEEK_END 2 + #define MSVCRT_STDIN_FILENO 0 #define MSVCRT_STDOUT_FILENO 1 #define MSVCRT_STDERR_FILENO 2

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

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