July 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 048751d86dc7ca9dd0d50fb1489bb035fa6dd483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048751d86dc7ca9dd0d50fb14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 7 13:27:25 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 60 +++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/po/ru.po b/po/ru.po index cdf9b25..29519d2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +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: 2016-05-26 20:47+0300\n" +"PO-Revision-Date: 2016-07-07 13:26+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.8.7.1\n" +"X-Generator: Poedit 1.8.8\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -11922,50 +11922,60 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Использование:\n" +" regedit [опции] [имя файла] [ключ реестра]\n" +"\n" +"Опции:\n" +" [без опций] Запуск графического интерфейса программы.\n" +" /L:system.dat Путь к редактируемому файлу system.dat.\n" +" Совместима с любыми другими опциями. Игнорируется.\n" +" /R:user.dat Путь к редактируемому файлу user.dat.\n" +" Совместима с любыми другими опциями. Игнорируется.\n" +" /C Импортировать содержимое файла реестра.\n" +" /D Удалить указанный ключ.\n" +" /E Экспортировать содержимое ключа в файл.\n" +" Если ключ не указан, экспортируется весь реестр.\n" +" /S Тихий режим. Сообщения не отображаются.\n" +" /V Запуск графического интерфейса в расширенном режиме. " +"Игнорируется.\n" +" /? Показать эту справку и завершить программу.\n" +" [имя файла] Путь файла, содержащего импортируемые данные.\n" +" При использовании с [/E], эта опция указывает путь к файлу " +"для экспорта данных.\n" +" [ключ реестра] Редактируемый ключ реестра.\n" +"\n" +"Примеры использования:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: неверный или неизвестный параметр [%1]\n" -"\n" +msgstr "regedit: неверный или неизвестный параметр [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Для справки введите «REG /?».\n" +msgstr "Для справки введите «regedit /?».\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Команда не указана." +msgstr "regedit: имя файла не указано.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: не указан удаляемый ключ.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: приложение с идентификатором «%1» не найдено\n" +msgstr "regedit: файл «%1» не найден.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: не удалось получить доступ к удалённому компьютеру\n" +msgstr "regedit: не удалось открыть файл «%1».\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Неверная операция с дескриптором.\n" +msgstr "regedit: операция не поддерживается.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Iván Matellanes : msvcirt/tests: Remove unnecessary casts.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 3f59de0faff08faa93e311c55d890602e2adcf20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f59de0faff08faa93e311c55… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jul 6 19:51:03 2016 +0100 msvcirt/tests: Remove unnecessary casts. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index b00e9a8..3e8b548 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -2663,10 +2663,10 @@ static void test_ostream(void) { ok(os1.base_ios.sb == NULL, "expected %p got %p\n", NULL, os1.base_ios.sb); ok(os1.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, os1.base_ios.state); call_func1(p_ostream_vbase_dtor, &os1); - pos = call_func3(p_ostream_sb_ctor, &os1, (streambuf*) &fb1, TRUE); + pos = call_func3(p_ostream_sb_ctor, &os1, &fb1.base, TRUE); ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); ok(os1.unknown == 0, "expected 0 got %d\n", os1.unknown); - ok(os1.base_ios.sb == (streambuf*) &fb1, "expected %p got %p\n", &fb1, os1.base_ios.sb); + ok(os1.base_ios.sb == &fb1.base, "expected %p got %p\n", &fb1.base, os1.base_ios.sb); ok(os1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, os1.base_ios.state); ok(fb1.base.allocated == 0xabababab, "expected %d got %d\n", 0xabababab, fb1.base.allocated); call_func1(p_filebuf_ctor, &fb1); @@ -2687,10 +2687,10 @@ static void test_ostream(void) { os1.unknown = 0xabababab; os1.base_ios.state = 0xabababab | IOSTATE_badbit; os1.base_ios.delbuf = 0; - pos = call_func3(p_ostream_sb_ctor, &os1, (streambuf*) &fb1, FALSE); + pos = call_func3(p_ostream_sb_ctor, &os1, &fb1.base, FALSE); ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); ok(os1.unknown == 0, "expected 0 got %d\n", os1.unknown); - ok(os1.base_ios.sb == (streambuf*) &fb1, "expected %p got %p\n", &fb1, os1.base_ios.sb); + ok(os1.base_ios.sb == &fb1.base, "expected %p got %p\n", &fb1.base, os1.base_ios.sb); ok(os1.base_ios.state == 0xabababab, "expected %d got %d\n", 0xabababab, os1.base_ios.state); call_func1(p_ostream_dtor, &os1.base_ios); memset(&os1, 0xab, sizeof(ostream)); @@ -2741,10 +2741,10 @@ static void test_ostream(void) { os1.base_ios.flags = 0xabababab; os1.base_ios.precision = 0xabababab; os1.base_ios.width = 0xabababab; - pos = call_func2(p_ostream_assign_sb, &os1, (streambuf*) &fb1); + pos = call_func2(p_ostream_assign_sb, &os1, &fb1.base); ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); ok(os1.unknown == 0xabababab, "expected 0 got %d\n", os1.unknown); - ok(os1.base_ios.sb == (streambuf*) &fb1, "expected %p got %p\n", &fb1, os1.base_ios.sb); + ok(os1.base_ios.sb == &fb1.base, "expected %p got %p\n", &fb1.base, os1.base_ios.sb); ok(os1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, os1.base_ios.state); ok(os1.base_ios.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, os1.base_ios.fill); ok(os1.base_ios.delbuf == 0, "expected 0 got %d\n", os1.base_ios.delbuf); @@ -2770,13 +2770,13 @@ static void test_ostream(void) { /* flush */ if (0) /* crashes on native */ pos = call_func1(p_ostream_flush, &os1); - os1.base_ios.sb = (streambuf*) &fb2; + os1.base_ios.sb = &fb2.base; call_func1(p_filebuf_ctor, &fb2); pos = call_func1(p_ostream_flush, &os1); ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); - os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.sb = &fb1.base; os1.base_ios.state = IOSTATE_eofbit; ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "Never gonna tell a lie", 22); ok(ret == 22, "expected 22 got %d\n", ret); @@ -2788,7 +2788,7 @@ if (0) /* crashes on native */ ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); os1.base_ios.tie = &os2; - os2.base_ios.sb = (streambuf*) &fb2; + os2.base_ios.sb = &fb2.base; os2.base_ios.state = IOSTATE_goodbit; pfb = call_func4(p_filebuf_open, &fb2, filename2, OPENMODE_out, filebuf_openprot); ok(pfb == &fb2, "wrong return, expected %p got %p\n", &fb2, pfb); @@ -2811,7 +2811,7 @@ if (0) /* crashes on native */ ok(ret == 0, "expected 0 got %d\n", ret); ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); - os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.sb = &fb1.base; os1.base_ios.state = IOSTATE_badbit; ret = (int) call_func1(p_ostream_opfx, &os1); ok(ret == 0, "expected 0 got %d\n", ret); @@ -2826,7 +2826,7 @@ if (0) /* crashes on native */ os2.base_ios.sb = NULL; if (0) /* crashes on native */ ret = (int) call_func1(p_ostream_opfx, &os1); - os2.base_ios.sb = (streambuf*) &fb2; + os2.base_ios.sb = &fb2.base; os2.base_ios.state = IOSTATE_badbit; ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "We've known each other", 22); ok(ret == 22, "expected 22 got %d\n", ret); @@ -2853,7 +2853,7 @@ if (0) /* crashes on native */ os1.base_ios.sb = NULL; if (0) /* crashes on native */ call_func1(p_ostream_osfx, &os1); - os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.sb = &fb1.base; os1.base_ios.flags = FLAGS_unitbuf; call_func1(p_ostream_osfx, &os1); ok(os1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, os1.base_ios.state); @@ -2893,7 +2893,7 @@ if (0) /* crashes on native */ os1.base_ios.sb = NULL; if (0) /* crashes on native */ pos = call_func2(p_ostream_put_char, &os1, 'c'); - os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.sb = &fb1.base; os1.base_ios.width = 5; call_func1(p_filebuf_sync, &fb1); fd = fb1.fd; @@ -2925,7 +2925,7 @@ if (0) /* crashes on native */ os1.base_ios.sb = NULL; if (0) /* crashes on native */ pos = call_func3(p_ostream_write_char, &os1, "been", 4); - os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.sb = &fb1.base; os1.base_ios.width = 5; call_func1(p_filebuf_sync, &fb1); fd = fb1.fd;

1 0

Iván Matellanes : msvcirt: Cast to unsigned char before promotion to int.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 46978629fd01c3801562510da867d24e9d97b9e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46978629fd01c3801562510da… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jul 6 19:51:02 2016 +0100 msvcirt: Cast to unsigned char before promotion to int. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 16 ++++++++-------- dlls/msvcirt/tests/msvcirt.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 5f44854..3adaf74 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -740,7 +740,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_sputc, 8) int __thiscall streambuf_sputc(streambuf *this, int ch) { TRACE("(%p %d)\n", this, ch); - return (this->pptr < this->epptr) ? *this->pptr++ = ch : call_streambuf_overflow(this, ch); + return (this->pptr < this->epptr) ? (unsigned char)(*this->pptr++ = ch) : call_streambuf_overflow(this, ch); } /* ?sgetn(a)streambuf@@QAEHPADH(a)Z */ @@ -773,7 +773,7 @@ int __thiscall streambuf_snextc(streambuf *this) if (this->gptr >= this->egptr) call_streambuf_underflow(this); this->gptr++; - return (this->gptr < this->egptr) ? *this->gptr : call_streambuf_underflow(this); + return (this->gptr < this->egptr) ? (unsigned char)(*this->gptr) : call_streambuf_underflow(this); } } @@ -792,7 +792,7 @@ int __thiscall streambuf_sbumpc(streambuf *this) if (ret == EOF) ret = call_streambuf_underflow(this); } else { - ret = (this->gptr < this->egptr) ? *this->gptr : call_streambuf_underflow(this); + ret = (this->gptr < this->egptr) ? (unsigned char)(*this->gptr) : call_streambuf_underflow(this); this->gptr++; } return ret; @@ -1159,7 +1159,7 @@ int __thiscall filebuf_underflow(filebuf *this) TRACE("(%p)\n", this); if (this->base.unbuffered) - return (_read(this->fd, &c, 1) < 1) ? EOF : c; + return (_read(this->fd, &c, 1) < 1) ? EOF : (unsigned char) c; if (this->base.gptr >= this->base.egptr) { if (call_streambuf_sync(&this->base) == EOF) @@ -1171,7 +1171,7 @@ int __thiscall filebuf_underflow(filebuf *this) this->base.eback = this->base.gptr = this->base.base; this->base.egptr = this->base.base + read_bytes; } - return *this->base.gptr; + return (unsigned char) *this->base.gptr; } /* ??0strstreambuf@@QAE(a)ABV0@@Z */ @@ -1467,14 +1467,14 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) { TRACE("(%p)\n", this); if (this->base.gptr < this->base.egptr) - return *this->base.gptr; + return (unsigned char) *this->base.gptr; /* extend the get area to include the characters written */ if (this->base.egptr < this->base.pptr) { this->base.gptr = this->base.base + (this->base.gptr - this->base.eback); this->base.eback = this->base.base; this->base.egptr = this->base.pptr; } - return (this->base.gptr < this->base.egptr) ? *this->base.gptr : EOF; + return (this->base.gptr < this->base.egptr) ? (unsigned char)(*this->base.gptr) : EOF; } /* ??0stdiobuf@@QAE(a)ABV0@@Z */ @@ -1701,7 +1701,7 @@ int __thiscall stdiobuf_underflow(stdiobuf *this) memmove(this->base.egptr - read_bytes, this->base.eback, read_bytes); this->base.gptr = this->base.egptr - read_bytes; } - return *this->base.gptr++; + return (unsigned char) *this->base.gptr++; } /* ??0ios@@IAE(a)ABV0@@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index ad2b8f7..b00e9a8 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -901,6 +901,18 @@ static void test_streambuf(void) ok(overflow_count == 0, "no call to overflow expected\n"); ok(*sb.pbase == 'c', "expected 'c' in the put area, got %c\n", *sb.pbase); ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); + sb.pptr--; + ret = (int) call_func2(p_streambuf_sputc, &sb, 150); + ok(ret == 150, "wrong return value, expected 150 got %d\n", ret); + ok(overflow_count == 0, "no call to overflow expected\n"); + ok(*sb.pbase == -106, "expected -106 in the put area, got %d\n", *sb.pbase); + ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); + sb.pptr--; + ret = (int) call_func2(p_streambuf_sputc, &sb, -50); + ok(ret == 206, "wrong return value, expected 206 got %d\n", ret); + ok(overflow_count == 0, "no call to overflow expected\n"); + ok(*sb.pbase == -50, "expected -50 in the put area, got %d\n", *sb.pbase); + ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); test_this = &sb2; ret = (int) call_func2(p_streambuf_sputc, &sb2, 'c'); ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); @@ -996,6 +1008,10 @@ static void test_streambuf(void) ret = (int) call_func1(p_streambuf_snextc, &sb); ok(ret == 'e', "expected 'e' got '%c'\n", ret); ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); + *sb.gptr-- = -50; + ret = (int) call_func1(p_streambuf_snextc, &sb); + ok(ret == 206, "expected 206 got %d\n", ret); + ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); test_this = &sb2; ret = (int) call_func1(p_streambuf_snextc, &sb2); ok(ret == EOF, "expected EOF got '%c'\n", ret); @@ -1043,8 +1059,12 @@ static void test_streambuf(void) ok(underflow_count == 49, "expected 2 calls to underflow, got %d\n", underflow_count - 47); /* sbumpc */ + sb.gptr = sb.eback; ret = (int) call_func1(p_streambuf_sbumpc, &sb); - ok(ret == 'e', "expected 'e' got '%c'\n", ret); + ok(ret == 'T', "expected 'T' got '%c'\n", ret); + ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); + ret = (int) call_func1(p_streambuf_sbumpc, &sb); + ok(ret == 206, "expected 206 got %d\n", ret); ok(sb.gptr == sb.eback + 2, "wrong get pointer, expected %p got %p\n", sb.eback + 2, sb.gptr); test_this = &sb2; ret = (int) call_func1(p_streambuf_sbumpc, &sb2); @@ -1477,6 +1497,11 @@ static void test_filebuf(void) ok(ret == 'A', "wrong return, expected 'A' got %d\n", ret); ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); ok(fb1.base.pptr == fb1.base.base + 256, "wrong put pointer, expected %p got %p\n", fb1.base.base + 256, fb1.base.pptr); + *fb1.base.gptr = -50; + ret = (int) call_func1(p_filebuf_underflow, &fb1); + ok(ret == 206, "wrong return, expected 206 got %d\n", ret); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.pptr == fb1.base.base + 256, "wrong put pointer, expected %p got %p\n", fb1.base.base + 256, fb1.base.pptr); fb1.base.gptr = fb1.base.ebuf; ret = (int) call_func1(p_filebuf_underflow, &fb1); ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); @@ -1497,6 +1522,11 @@ static void test_filebuf(void) ok(ret == 'A', "wrong return, expected 'A' got %d\n", ret); ret = (int) call_func1(p_filebuf_underflow, &fb2); ok(ret == '\n', "wrong return, expected '\\n' got %d\n", ret); + ok(_lseek(fb2.fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ok(_write(fb2.fd, "\xCE\n", 2) == 2, "_write failed\n"); + ok(_lseek(fb2.fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ret = (int) call_func1(p_filebuf_underflow, &fb2); + ok(ret == 206, "wrong return, expected 206 got %d\n", ret); fb2.base.do_lock = 0; pret = call_func1(p_filebuf_close, &fb2); ok(pret == &fb2, "wrong return, expected %p got %p\n", &fb2, pret); @@ -1782,6 +1812,10 @@ static void test_strstreambuf(void) ret = (int) call_func1(p_strstreambuf_underflow, &ssb1); ok(ret == 'G', "expected 'G' got %d\n", ret); ok(ssb1.base.egptr == buffer + 25, "wrong get end, expected %p got %p\n", buffer + 25, ssb1.base.egptr); + *ssb1.base.gptr = -50; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb1); + ok(ret == 206, "expected 206 got %d\n", ret); + ok(ssb1.base.egptr == buffer + 25, "wrong get end, expected %p got %p\n", buffer + 25, ssb1.base.egptr); ssb1.base.gptr = ssb1.base.egptr = ssb1.base.pptr = ssb1.base.epptr; ret = (int) call_func1(p_strstreambuf_underflow, &ssb1); ok(ret == EOF, "expected EOF got %d\n", ret); @@ -1811,8 +1845,9 @@ static void test_strstreambuf(void) ssb2.base.eback = ssb2.base.egptr = ssb2.base.base + 1; ssb2.base.gptr = ssb2.base.base + 3; ssb2.base.pptr = ssb2.base.base + 5; + *(ssb2.base.base + 2) = -50; ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); - ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(ret == 206, "expected 206 got %d\n", ret); ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); ok(ssb2.base.egptr == ssb2.base.base + 5, "wrong get end, expected %p got %p\n", ssb2.base.base + 5, ssb2.base.egptr); @@ -2115,6 +2150,10 @@ static void test_stdiobuf(void) ret = (int) call_func1(p_stdiobuf_underflow, &stb1); ok(ret == 'v', "expected 'v' got %d\n", ret); ok(stb1.base.gptr == stb1.base.egptr - 46, "wrong get pointer, expected %p got %p\n", stb1.base.egptr - 46, stb1.base.gptr); + *stb1.base.gptr = -50; + ret = (int) call_func1(p_stdiobuf_underflow, &stb1); + ok(ret == 206, "expected 206 got %d\n", ret); + ok(stb1.base.gptr == stb1.base.egptr - 45, "wrong get pointer, expected %p got %p\n", stb1.base.egptr - 45, stb1.base.gptr); stb1.base.gptr = stb1.base.egptr; ret = (int) call_func1(p_stdiobuf_underflow, &stb1); ok(ret == EOF, "expected EOF got %d\n", ret);

1 0

Nikolay Sivov : dwrite: Check all 'vert' lookups, not just the first one.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: c4d08275d064e5da5ca55267fe02ed3e43eb4610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d08275d064e5da5ca55267f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 23:16:42 2016 +0300 dwrite: Check all 'vert' lookups, not just the first one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 66 +++++++++++++++++++++++++----------------------- dlls/dwrite/tests/font.c | 63 +++++++++++++++++++++++---------------------- 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 19dc6dd..b35f1df 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1954,7 +1954,7 @@ BOOL opentype_has_vertical_variants(IDWriteFontFace3 *fontface) for (i = 0; i < GET_BE_WORD(featurelist->FeatureCount); i++) { if (*(UINT32*)featurelist->FeatureRecord[i].FeatureTag == DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING) { const OT_Feature *feature = (const OT_Feature*)((BYTE*)featurelist + GET_BE_WORD(featurelist->FeatureRecord[i].Feature)); - UINT16 lookup_count = GET_BE_WORD(feature->LookupCount), index, count, type; + UINT16 lookup_count = GET_BE_WORD(feature->LookupCount), i, index, count, type; const GSUB_SingleSubstFormat2 *subst2; const OT_LookupTable *lookup_table; UINT32 offset; @@ -1962,40 +1962,42 @@ BOOL opentype_has_vertical_variants(IDWriteFontFace3 *fontface) if (lookup_count == 0) continue; - /* check if lookup is empty */ - index = GET_BE_WORD(feature->LookupListIndex[0]); - lookup_table = (const OT_LookupTable*)((BYTE*)lookup_list + GET_BE_WORD(lookup_list->Lookup[index])); - - type = GET_BE_WORD(lookup_table->LookupType); - if (type != OPENTYPE_GPOS_SINGLE_SUBST && type != OPENTYPE_GPOS_EXTENSION_SUBST) - continue; - - count = GET_BE_WORD(lookup_table->SubTableCount); - if (count == 0) - continue; - - offset = GET_BE_WORD(lookup_table->SubTable[0]); - if (type == OPENTYPE_GPOS_EXTENSION_SUBST) { - const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)lookup_table + offset); - if (GET_BE_WORD(ext->SubstFormat) == 1) - offset += GET_BE_DWORD(ext->ExtensionOffset); - else - FIXME("Unhandled Extension Substitution Format %u\n", GET_BE_WORD(ext->SubstFormat)); - } + for (i = 0; i < lookup_count; i++) { + /* check if lookup is empty */ + index = GET_BE_WORD(feature->LookupListIndex[i]); + lookup_table = (const OT_LookupTable*)((BYTE*)lookup_list + GET_BE_WORD(lookup_list->Lookup[index])); + + type = GET_BE_WORD(lookup_table->LookupType); + if (type != OPENTYPE_GPOS_SINGLE_SUBST && type != OPENTYPE_GPOS_EXTENSION_SUBST) + continue; + + count = GET_BE_WORD(lookup_table->SubTableCount); + if (count == 0) + continue; + + offset = GET_BE_WORD(lookup_table->SubTable[0]); + if (type == OPENTYPE_GPOS_EXTENSION_SUBST) { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)lookup_table + offset); + if (GET_BE_WORD(ext->SubstFormat) == 1) + offset += GET_BE_DWORD(ext->ExtensionOffset); + else + FIXME("Unhandled Extension Substitution Format %u\n", GET_BE_WORD(ext->SubstFormat)); + } - subst2 = (const GSUB_SingleSubstFormat2*)((BYTE*)lookup_table + offset); - index = GET_BE_WORD(subst2->SubstFormat); - if (index == 1) - FIXME("Validate Single Substitution Format 1\n"); - else if (index == 2) { - /* SimSun-ExtB has 0 glyph count for this substitution */ - if (GET_BE_WORD(subst2->GlyphCount) > 0) { - ret = TRUE; - break; + subst2 = (const GSUB_SingleSubstFormat2*)((BYTE*)lookup_table + offset); + index = GET_BE_WORD(subst2->SubstFormat); + if (index == 1) + FIXME("Validate Single Substitution Format 1\n"); + else if (index == 2) { + /* SimSun-ExtB has 0 glyph count for this substitution */ + if (GET_BE_WORD(subst2->GlyphCount) > 0) { + ret = TRUE; + break; + } } + else + WARN("Unknown Single Substitution Format, %u\n", index); } - else - WARN("Unknown Single Substitution Format, %u\n", index); } } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a1ef3d4..0459285 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6381,7 +6381,7 @@ static BOOL has_vertical_glyph_variants(IDWriteFontFace1 *fontface) for (i = 0; i < GET_BE_WORD(featurelist->FeatureCount); i++) { if (*(UINT32*)featurelist->FeatureRecord[i].FeatureTag == DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING) { const OT_Feature *feature = (const OT_Feature*)((BYTE*)featurelist + GET_BE_WORD(featurelist->FeatureRecord[i].Feature)); - UINT16 lookup_count = GET_BE_WORD(feature->LookupCount), index, count, type; + UINT16 lookup_count = GET_BE_WORD(feature->LookupCount), i, index, count, type; const GSUB_SingleSubstFormat2 *subst2; const OT_LookupTable *lookup_table; UINT32 offset; @@ -6389,44 +6389,43 @@ static BOOL has_vertical_glyph_variants(IDWriteFontFace1 *fontface) if (lookup_count == 0) continue; - ok(lookup_count == 1, "got lookup count %u\n", lookup_count); + for (i = 0; i < lookup_count; i++) { + /* check if lookup is empty */ + index = GET_BE_WORD(feature->LookupListIndex[i]); + lookup_table = (const OT_LookupTable*)((BYTE*)lookup_list + GET_BE_WORD(lookup_list->Lookup[index])); - /* check if lookup is empty */ - index = GET_BE_WORD(feature->LookupListIndex[0]); - lookup_table = (const OT_LookupTable*)((BYTE*)lookup_list + GET_BE_WORD(lookup_list->Lookup[index])); + type = GET_BE_WORD(lookup_table->LookupType); + ok(type == 1 || type == 7, "got unexpected lookup type %u\n", type); - type = GET_BE_WORD(lookup_table->LookupType); - ok(type == 1 || type == 7, "got unexpected lookup type %u\n", type); + count = GET_BE_WORD(lookup_table->SubTableCount); + if (count == 0) + continue; + ok(count > 0, "got unexpected subtable count %u\n", count); - count = GET_BE_WORD(lookup_table->SubTableCount); - if (count == 0) - continue; - - ok(count > 0, "got unexpected subtable count %u\n", count); - - offset = GET_BE_WORD(lookup_table->SubTable[0]); - if (type == 7) { - const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)lookup_table + offset); - if (GET_BE_WORD(ext->SubstFormat) == 1) - offset += GET_BE_DWORD(ext->ExtensionOffset); - else - ok(0, "Unhandled Extension Substitution Format %u\n", GET_BE_WORD(ext->SubstFormat)); - } + offset = GET_BE_WORD(lookup_table->SubTable[0]); + if (type == 7) { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)lookup_table + offset); + if (GET_BE_WORD(ext->SubstFormat) == 1) + offset += GET_BE_DWORD(ext->ExtensionOffset); + else + ok(0, "Unhandled Extension Substitution Format %u\n", GET_BE_WORD(ext->SubstFormat)); + } - subst2 = (const GSUB_SingleSubstFormat2*)((BYTE*)lookup_table + offset); - index = GET_BE_WORD(subst2->SubstFormat); - if (index == 1) - ok(0, "validate Single Substitution Format 1\n"); - else if (index == 2) { - /* SimSun-ExtB has 0 glyph count for this substitution */ - if (GET_BE_WORD(subst2->GlyphCount) > 0) { - ret = TRUE; - break; + subst2 = (const GSUB_SingleSubstFormat2*)((BYTE*)lookup_table + offset); + index = GET_BE_WORD(subst2->SubstFormat); + if (index == 1) + ok(0, "validate Single Substitution Format 1\n"); + else if (index == 2) { + /* SimSun-ExtB has 0 glyph count for this substitution */ + if (GET_BE_WORD(subst2->GlyphCount) > 0) { + ret = TRUE; + break; + } } + else + ok(0, "unknown Single Substitution Format, %u\n", index); } - else - ok(0, "unknown Single Substitution Format, %u\n", index); } }

1 0

Nikolay Sivov : xmllite/writer: Initial support for indented output.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: c52fa73a43f1159d1e643eff17f409d2c0352129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52fa73a43f1159d1e643eff1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 22:54:11 2016 +0300 xmllite/writer: Initial support for indented output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 43 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b4d7102..9318bda 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1006,6 +1006,54 @@ static void test_writer_state(void) IXmlWriter_Release(writer); } +static void test_indentation(void) +{ + static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, commentW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " <b />\r\n" + "</a>"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1021,4 +1069,5 @@ START_TEST(writer) test_WriteComment(); test_WriteCData(); test_WriteRaw(); + test_indentation(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 65d0bcc..49e65cc 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -2,7 +2,7 @@ * IXmlWriter implementation * * Copyright 2011 Alistair Leslie-Hughes - * Copyright 2014 Nikolay Sivov for CodeWeavers + * Copyright 2014, 2016 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -90,6 +90,7 @@ typedef struct _xmlwriter LONG ref; IMalloc *imalloc; xmlwriteroutput *output; + unsigned int indent_level; BOOL indent; BOOL bom; BOOL omitxmldecl; @@ -417,6 +418,32 @@ static HRESULT writer_close_starttag(xmlwriter *writer) return hr; } +static void writer_inc_indent(xmlwriter *writer) +{ + writer->indent_level++; +} + +static void writer_dec_indent(xmlwriter *writer) +{ + if (writer->indent_level) + writer->indent_level--; +} + +static void write_node_indent(xmlwriter *writer) +{ + static const WCHAR dblspaceW[] = {' ',' '}; + static const WCHAR crlfW[] = {'\r','\n'}; + unsigned int indent_level = writer->indent_level; + + if (!writer->indent) + return; + + if (writer->output->buffer.written) + write_output_buffer(writer->output, crlfW, ARRAY_SIZE(crlfW)); + while (indent_level--) + write_output_buffer(writer->output, dblspaceW, ARRAY_SIZE(dblspaceW)); +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -483,6 +510,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; This->bomwritten = FALSE; + This->indent_level = 0; } /* just reset current output */ @@ -554,6 +582,9 @@ static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LO switch (property) { + case XmlWriterProperty_Indent: + This->indent = !!value; + break; case XmlWriterProperty_ByteOrderMark: This->bom = !!value; break; @@ -636,6 +667,7 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) len = data ? strlenW(data) : 0; + write_node_indent(This); if (!len) write_cdata_section(This->output, NULL, 0); else { @@ -696,6 +728,7 @@ static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, return E_NOTIMPL; } + static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) { static const WCHAR copenW[] = {'<','!','-','-'}; @@ -717,6 +750,7 @@ static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) ; } + write_node_indent(This); write_output_buffer(This->output, copenW, ARRAY_SIZE(copenW)); if (comment) { int len = strlenW(comment), i; @@ -841,6 +875,8 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) if (!element) return WR_E_INVALIDACTION; + writer_dec_indent(This); + if (This->starttagopen) { static WCHAR closetagW[] = {' ','/','>'}; write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); @@ -848,6 +884,7 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) } else { /* write full end tag */ + write_node_indent(This); write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); @@ -994,6 +1031,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP } write_encoding_bom(This); + write_node_indent(This); write_output_buffer(This->output, openpiW, ARRAY_SIZE(openpiW)); write_output_buffer(This->output, name, -1); write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); @@ -1130,8 +1168,10 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre push_element(This, element); + write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, local_name); + writer_inc_indent(This); return S_OK; } @@ -1302,6 +1342,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writer->output = NULL; + writer->indent_level = 0; writer->indent = FALSE; writer->bom = TRUE; writer->omitxmldecl = FALSE;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: fc1563591f1e201cd95330a8a1015d9401b8674a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1563591f1e201cd95330a8a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 6 23:01:01 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 55 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/po/fi.po b/po/fi.po index dd6a63b..752b050 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11900,50 +11900,59 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Käyttö:\n" +" regedit [valitsimet] [tiedosto] [rek. avain]\n" +"\n" +"Valitsimet:\n" +" [ei mitään] Käynnistä tämän ohjelman graafinen versio.\n" +" /L:system.dat Muokattavan system.dat-tiedoston sijainti.\n" +" Sopii yhteen muiden valitsinten kanssa. Ei huomioida.\n" +" /R:user.dat Muokattavan user.dat-tiedoston sijainti.\n" +" Sopii yhteen muiden valitsinten kanssa. Ei huomioida.\n" +" /C Tuo rekisteritiedoston sisältö.\n" +" /D Poista määritelty rekisteriavain.\n" +" /E Vie valitun rekisteriavaimen sisältö tiedostoon.\n" +" Jos avainta ei määritellä, koko rekisteri viedään.\n" +" /S Hiljainen tila. Mitään viestejä ei näytetä.\n" +" /V Käynnistä tämä ohjelma edistyneessä tilassa. Ei huomioida.\n" +" /? Näytä nämä tiedot ja lopeta.\n" +" [tiedosto] Sen tiedoston polku, josta rekisteritietoja tuodaan.\n" +" Valitsimen [/E] yhteydessä sen tiedoston polku, johon\n" +" rekisteritiedot viedään.\n" +" [rek. avain] Rekisteriavain, jota muokataan.\n" +"\n" +"Käyttöesimerkkejä:\n" +" regedit \"tuotava.reg\"\n" +" regedit /E \"vietävä.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: Virheellinen tai tuntematon valitsin [%1]\n" -"\n" +msgstr "regedit: Virheellinen tai tuntematon valitsin [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Komennolla \"REG /?\" saat apua.\n" +msgstr "Komennolla \"regedit /?\" saat apua.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Komentoa ei määritelty." +msgstr "regedit: Tiedostonimeä ei määritelty.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Poistettavaa rekisteriavainta ei määritelty.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: Ei löydy ohjelmaa, jonka GUID olisi '%1'\n" +msgstr "regedit: Tiedostoa '%1' ei löydy.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: Ei pääsyä etäkoneelle\n" +msgstr "regedit: Tiedostoa '%1' ei voida avata.\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Kahvaoperaatio ei kelpaa.\n" +msgstr "regedit: Käsittelemätön toiminto.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Jacek Caban : wininet: Free all cookie data in free_cookie.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 8332d8066574e98690101b4523e3afc00ae9f352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8332d8066574e98690101b452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:43:35 2016 +0200 wininet: Free all cookie data in free_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 38f69e0..3240633 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -684,6 +684,33 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) return res; } +static void free_cookie_domain_list(struct list *list) +{ + cookie_container_t *container; + cookie_domain_t *domain; + + while(!list_empty(list)) { + domain = LIST_ENTRY(list_next(list, list), cookie_domain_t, entry); + + free_cookie_domain_list(&domain->subdomain_list); + + while(!list_empty(&domain->path_list)) { + container = LIST_ENTRY(list_next(&domain->path_list, &domain->path_list), cookie_container_t, entry); + + while(!list_empty(&container->cookie_list)) + delete_cookie(LIST_ENTRY(list_next(&container->cookie_list, &container->cookie_list), cookie_t, entry)); + + heap_free(container->cookie_url); + list_remove(&container->entry); + heap_free(container); + } + + heap_free(domain->domain); + list_remove(&domain->entry); + heap_free(domain); + } +} + /*********************************************************************** * InternetGetCookieExW (WININET.@) * @@ -1239,5 +1266,9 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci void free_cookie(void) { - DeleteCriticalSection(&cookie_cs); + EnterCriticalSection(&cookie_cs); + + free_cookie_domain_list(&domain_list); + + LeaveCriticalSection(&cookie_cs); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: c0da44ee3abc8784b9209b5a6d0d0073db1db208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0da44ee3abc8784b9209b5a6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jul 6 11:38:05 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 58 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1985884..f8f9dcb 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: 2016-05-24 22:38+0300\n" +"PO-Revision-Date: 2016-07-06 11:31+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" @@ -11925,50 +11925,60 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Naudojimas:\n" +" regedit [parametrai] [failas] [reg_key]\n" +"\n" +"Parametrai:\n" +" [be parametro] Paleidžia šios programos grafinę versiją.\n" +" /L:system.dat Modifikuojamo system.dat failo vieta.\n" +" Suderinamas su bet kuriuo kitu parametru. Ignoruojamas.\n" +" /R:user.dat Modifikuojamo user.dat failo vieta.\n" +" Suderinamas su bet kuriuo kitu parametru. Ignoruojamas.\n" +" /C Importuoti registro failo turinį.\n" +" /D Pašalinti nurodytą registro raktą.\n" +" /E Eksportuoti nurodyto registro rakto turinį į failą.\n" +" Jei nenurodytas raktas, eksportuojamas visas registras.\n" +" /S Tyli veiksena. Nebus rodomi pranešimai.\n" +" /V Paleisti grafinę sąsają išplėstinėje veiksenoje. " +"Ignoruojamas.\n" +" /? Parodyti šią informaciją ir išeiti.\n" +" [failas] Failo su registro informacija importui vieta.\n" +" Kai naudojama su [/E], šis parametras nurodo\n" +" failo vietą registro informacijos eksportui.\n" +" [reg_key] Registro raktas modifikavimui.\n" +"\n" +"Naudojimo pavyzdžiai:\n" +" regedit \"importui.reg\"\n" +" regedit /E \"eksportuota.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: Netinkamas arba neatpažintas parametras [%1]\n" -"\n" +msgstr "regedit: Netinkamas arba neatpažintas parametras [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Pagalbai įrašykite „REG /?“.\n" +msgstr "Pagalbai įrašykite „regedit /?“.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Nenurodyta jokia komanda." +msgstr "regedit: Nenurodytas joks failas.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Nenurodytas registro raktas šalinimui.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "šalinimo programa: Programa su GUID „%1“ nerasta\n" +msgstr "regedit: Failas „%1“ nerastas.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: Nepavyko prieiti prie nuotolinio kompiuterio\n" +msgstr "regedit: Nepavyko atverti failo „%1“.\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Neteisinga rodyklės operacija.\n" +msgstr "regedit: Neapdorojamas veiksmas.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Józef Kucia : d3d11/tests: Mention debug flags when device creation fails.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 5a53347747fda3410025e5a57700be203d717cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a53347747fda3410025e5a57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:34 2016 +0200 d3d11/tests: Mention debug flags when device creation fails. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2f69042..3ff7dd7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1361,7 +1361,7 @@ static void test_device_interfaces(void) device_desc.flags = D3D11_CREATE_DEVICE_DEBUG; if (!(device = create_device(&device_desc))) { - skip("Failed to create device for feature level %#x.\n", d3d11_feature_levels[i]); + skip("Failed to create debug device for feature level %#x.\n", d3d11_feature_levels[i]); continue; }

1 0

Max Qian : secur32: Added support for a few more algids.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: cf9cd32df385f545d5c4933140135bd8f56dd212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9cd32df385f545d5c493314… Author: Max Qian <public(a)maxqia.com> Date: Wed Jul 6 16:06:53 2016 +0200 secur32: Added support for a few more algids. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 23 ++++++++++++++++------- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcadd47..7f2dbd6 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -315,11 +315,12 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) { case GNUTLS_MAC_UNKNOWN: case GNUTLS_MAC_NULL: return 0; + case GNUTLS_MAC_MD2: return CALG_MD2; case GNUTLS_MAC_MD5: return CALG_MD5; - case GNUTLS_MAC_SHA1: - case GNUTLS_MAC_SHA256: - case GNUTLS_MAC_SHA384: - case GNUTLS_MAC_SHA512: return CALG_SHA; + case GNUTLS_MAC_SHA1: return CALG_SHA1; + case GNUTLS_MAC_SHA256: return CALG_SHA_256; + case GNUTLS_MAC_SHA384: return CALG_SHA_384; + case GNUTLS_MAC_SHA512: return CALG_SHA_512; default: FIXME("unknown algorithm %d\n", mac); return 0; @@ -330,9 +331,17 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) { switch (kx) { - case GNUTLS_KX_RSA: return CALG_RSA_KEYX; - case GNUTLS_KX_DHE_DSS: - case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; + case GNUTLS_KX_UNKNOWN: return 0; + case GNUTLS_KX_RSA: + case GNUTLS_KX_RSA_EXPORT: return CALG_RSA_KEYX; + case GNUTLS_KX_DHE_PSK: + case GNUTLS_KX_DHE_DSS: + case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; + case GNUTLS_KX_ANON_ECDH: return CALG_ECDH; + /* MSDN mentions CALG_ECDH_EPHEM, but doesn't appear in the Windows SDK. */ + case GNUTLS_KX_ECDHE_RSA: + case GNUTLS_KX_ECDHE_PSK: return CALG_ECDH; + case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA; default: FIXME("unknown algorithm %d\n", kx); return 0; diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index b940881..fdfa48e 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -500,7 +500,8 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_ECDHE_ECDSA: case schan_kx_ECDHE_RSA: return CALG_ECDH; case schan_kx_NULL: return 0; - case schan_kx_RSA: return CALG_RSA_KEYX; + case schan_kx_RSA: + case schan_kx_RSA_EXPORT: return CALG_RSA_KEYX; case schan_kx_DH_anon_EXPORT: case schan_kx_DH_anon: @@ -509,7 +510,6 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_DH_RSA_EXPORT: case schan_kx_DH_RSA: case schan_kx_FORTEZZA_DMS: - case schan_kx_RSA_EXPORT: FIXME("Don't know CALG for key exchange algorithm %d for cipher suite %#x, returning 0\n", c->kx_alg, (unsigned)c->suite); return 0;

1 0