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

Volkan Gezer : po: Update Turkish translation
by Alexandre Julliard July 8, 2013

July 8, 2013

Module: wine Branch: master Commit: 13f1a358401dfef009b7b89a84bb153eabe1f35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f1a358401dfef009b7b89a8… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Thu Jul 4 00:10:54 2013 +0200 po: Update Turkish translation --- po/tr.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/tr.po b/po/tr.po index 9ca439c..0f82206 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-24 11:42+0200\n" +"PO-Revision-Date: 2013-07-04 00:10+0200\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" -"Language-Team: none\n" +"Language-Team: Turkish <kde-l10n-tr(a)kde.org>\n" "Language: Turkish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -719,7 +719,7 @@ msgstr "&Seçim" #: comdlg32.rc:383 msgid "&from:" -msgstr "&Başlangıç:" +msgstr "&başlangıç:" #: comdlg32.rc:384 msgid "&to:" @@ -2354,11 +2354,11 @@ msgstr "Kullanmak biçimi seçin:" #: cryptui.rc:405 msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-encoded X.509 (*.cer)" +msgstr "&DER-Kodlu X.509 (*.cer)" #: cryptui.rc:407 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer):" +msgstr "Ba&se64-Kodlu X.509 (*.cer):" #: cryptui.rc:409 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2434,7 +2434,7 @@ msgstr "Bu sertifika aşağıdaki isteklerde amaçlanıyor:" #: cryptui.rc:35 msgid "Issued to: " -msgstr "Verilen:" +msgstr "Verilen: " #: cryptui.rc:36 msgid "Issued by: " @@ -2442,7 +2442,7 @@ msgstr "Veren: " #: cryptui.rc:37 msgid "Valid from " -msgstr "Geçerlilik başlangıcı" +msgstr "Geçerlilik başlangıcı " #: cryptui.rc:38 msgid " to " @@ -7926,7 +7926,7 @@ msgstr "Sık Kullanılanlar" #: shell32.rc:203 msgid "StartUp" -msgstr "Başlangı" +msgstr "Başlangıç" #: shell32.rc:204 msgid "Start Menu"

1 0

Dmitry Timoshkov : kernel32/tests: Fix compilation with a PSDK compiler.
by Alexandre Julliard July 8, 2013

July 8, 2013

Module: wine Branch: master Commit: 0fa1877e440c695e3b44968e9fc9dc1823edd06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa1877e440c695e3b44968e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 4 13:42:27 2013 +0900 kernel32/tests: Fix compilation with a PSDK compiler. --- dlls/kernel32/tests/path.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ba47910..41650f5 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -558,9 +559,10 @@ static void test_ShortPathCase(const char *tmpdir, const char *dirname, { char buf[MAX_PATH], shortbuf[MAX_PATH]; HANDLE hndl; - int i; + size_t i; - snprintf(buf,sizeof(buf),"%s\\%s\\%s",tmpdir,dirname,filename); + assert(strlen(tmpdir) + strlen(dirname) + strlen(filename) + 2 < sizeof(buf)); + sprintf(buf,"%s\\%s\\%s",tmpdir,dirname,filename); GetShortPathNameA(buf,shortbuf,sizeof(shortbuf)); hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError());

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for GetShortPathName called for a non-existent short file name.
by Alexandre Julliard July 8, 2013

July 8, 2013

Module: wine Branch: master Commit: 24ab4453d7acadca427fb165c4f71fc1fcb1218a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ab4453d7acadca427fb165c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 4 13:43:11 2013 +0900 kernel32/tests: Add a test for GetShortPathName called for a non-existent short file name. --- dlls/kernel32/tests/path.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 41650f5..d703aa9 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1275,7 +1275,17 @@ static void test_GetShortPathNameW(void) ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length ); ok( ret, "GetShortPathNameW returned 0.\n" ); + lstrcatW( short_path, name ); + + /* GetShortPathName for a non-existent short file name should fail */ + SetLastError(0xdeadbeef); + length = GetShortPathNameW( short_path, path, 0 ); +todo_wine + ok(!length, "GetShortPathNameW should fail\n"); +todo_wine + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" );

1 0

Francois Gouget : po: Use three dots instead of the Unicode ellipsis character.
by Alexandre Julliard July 8, 2013

July 8, 2013

Module: wine Branch: master Commit: 77c014518191b6a83adb07215859ad949f07c955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c014518191b6a83adb07215… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 8 16:27:53 2013 +0200 po: Use three dots instead of the Unicode ellipsis character. As specified by the Windows Czech Style Guide. --- po/cs.po | 130 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77c014518191b6a83adb0…

1 0

Francois Gouget : po: Use three dots instead of the Unicode ellipsis character.
by Alexandre Julliard July 8, 2013

July 8, 2013

Module: wine Branch: master Commit: 5a00a3fb44d58beec1efd7cf67e6154a4aa392c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a00a3fb44d58beec1efd7cf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 8 16:28:33 2013 +0200 po: Use three dots instead of the Unicode ellipsis character. As specified by the Windows Simplified Chinese Style Guide. --- po/zh_TW.po | 196 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 98 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a00a3fb44d58beec1efd…

1 0

John Chadwick : msxml3/tests: Add additional xpath conformance tests.
by Alexandre Julliard July 8, 2013

July 8, 2013

Module: wine Branch: master Commit: 36345a6c69d8d71fb110facc0b993b92def49061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36345a6c69d8d71fb110facc0… Author: John Chadwick <johnwchadwick(a)gmail.com> Date: Thu Jul 4 04:43:21 2013 -0400 msxml3/tests: Add additional xpath conformance tests. --- dlls/msxml3/tests/domdoc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 20b9609..b56edf8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4361,9 +4361,49 @@ static const selection_ns_t selection_ns_data[] = { { NULL } }; +typedef struct { + const char *query; + const char *list; +} xpath_test_t; + +static const xpath_test_t xpath_test[] = { + { "*/a", "E1.E1.E2.D1 E1.E2.E2.D1 E1.E4.E2.D1" }, + { "*/b", "E2.E1.E2.D1 E2.E2.E2.D1 E2.E4.E2.D1" }, + { "*/c", "E3.E1.E2.D1 E3.E2.E2.D1" }, + { "*/d", "E4.E1.E2.D1 E4.E2.E2.D1 E4.E4.E2.D1" }, + { "//a", "E1.E1.E2.D1 E1.E2.E2.D1 E1.E4.E2.D1" }, + { "//b", "E2.E1.E2.D1 E2.E2.E2.D1 E2.E4.E2.D1" }, + { "//c", "E3.E1.E2.D1 E3.E2.E2.D1" }, + { "//d", "E4.E1.E2.D1 E4.E2.E2.D1 E4.E4.E2.D1" }, + { "//c[@type]", "E3.E2.E2.D1" }, + { "//c[@type]/ancestor::node()[1]", "E2.E2.D1" }, + { "//c[@type]/ancestor-or-self::node()[1]", "E3.E2.E2.D1" }, + { "//c[@type]/attribute::node()[1]", "A'type'.E3.E2.E2.D1" }, + { "//c[@type]/child::node()[1]", "T1.E3.E2.E2.D1" }, + { "//c[@type]/descendant::node()[1]", "T1.E3.E2.E2.D1" }, + { "//c[@type]/descendant-or-self::node()[1]", "E3.E2.E2.D1" }, + { "//c[@type]/following::node()[1]", "E4.E2.E2.D1" }, + { "//c[@type]/following-sibling::node()[1]", "E4.E2.E2.D1" }, + { "//c[@type]/parent::node()[1]", "E2.E2.D1" }, + { "//c[@type]/preceding::node()[1]", "T1.E2.E2.E2.D1" }, + { "//c[@type]/self::node()[1]", "E3.E2.E2.D1" }, + { "child::*", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "child::text()", "" }, + { "child::*/..", "E2.D1" }, + { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, + { "self::node()", "E2.D1" }, + { "ancestor::node()", "D1" }, + { "elem[c][last()]/a", "E1.E2.E2.D1"}, + { "ancestor-or-self::node()[1]", "E2.D1" }, + { "((//a)[1])[last()]", "E1.E1.E2.D1" }, + { NULL } +}; + static void test_XPath(void) { const selection_ns_t *ptr = selection_ns_data; + const xpath_test_t *xptest = xpath_test; VARIANT var; VARIANT_BOOL b; IXMLDOMDocument2 *doc; @@ -4406,6 +4446,26 @@ static void test_XPath(void) EXPECT_HR(hr, S_OK); expect_list_and_release(list, "E2.D1"); + /* peform xpath tests */ + for ( ; xptest->query ; xptest++ ) + { + char *str; + + hr = IXMLDOMNode_selectNodes(rootNode, _bstr_(xptest->query), &list); + ok(hr == S_OK, "query evaluation failed for query=%s", xptest->query); + + if (hr != S_OK) + continue; + + str = list_to_string(list); + + ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", + xptest->query, str, xptest->list); + + if (list) + IXMLDOMNodeList_Release(list); + } + if (0) { /* namespace:: axis test is disabled until namespace definitions

1 0

Francois Gouget : mlang/tests: We already link with mlang. dll so there is no need to do a LoadLibrary() on it.
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 28139bceebd968692c78f287553513f2caa59011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28139bceebd968692c78f2875… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:15:32 2013 +0200 mlang/tests: We already link with mlang.dll so there is no need to do a LoadLibrary() on it. --- dlls/mlang/tests/mlang.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0da31b5..1d52af6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -230,13 +230,7 @@ static BOOL init_function_ptrs(void) { HMODULE hMlang; - hMlang = LoadLibraryA("mlang.dll"); - if (!hMlang) - { - skip("mlang not available\n"); - return FALSE; - } - + hMlang = GetModuleHandleA("mlang.dll"); pConvertINetMultiByteToUnicode = (void *)GetProcAddress(hMlang, "ConvertINetMultiByteToUnicode"); pConvertINetUnicodeToMultiByte = (void *)GetProcAddress(hMlang, "ConvertINetUnicodeToMultiByte"); pRfc1766ToLcidA = (void *)GetProcAddress(hMlang, "Rfc1766ToLcidA");

1 0

Francois Gouget : twain_32/tests: Generate an error and skip instead of assert()-ing when the setup fails.
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 499eaca38bf96df9a661a7ebdaad7c59188ae147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499eaca38bf96df9a661a7ebd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:11:01 2013 +0200 twain_32/tests: Generate an error and skip instead of assert()-ing when the setup fails. --- dlls/twain_32/tests/dsm.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index f3b6f95..96381e6 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -18,7 +18,7 @@ * */ #include <stdarg.h> -#include <assert.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -33,6 +33,7 @@ static DSMENTRYPROC pDSM_Entry; static BOOL dsm_RegisterWindowClasses(void) { WNDCLASSA cls; + BOOL rc; cls.style = 0; cls.lpfnWndProc = DefWindowProc; @@ -44,9 +45,10 @@ static BOOL dsm_RegisterWindowClasses(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TWAIN_dsm_class"; - if (!RegisterClassA(&cls)) return FALSE; - return TRUE; + rc = RegisterClassA(&cls); + ok(rc, "RegisterClassA failed: le=%u\n", GetLastError()); + return rc; } @@ -832,7 +834,11 @@ START_TEST(dsm) HANDLE hwnd; HMODULE htwain; - if (!dsm_RegisterWindowClasses()) assert(0); + if (!dsm_RegisterWindowClasses()) + { + skip("Could not register the test class, skipping tests\n"); + return; + } htwain = LoadLibraryA("twain_32.dll"); if (! htwain)

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: df9f8be197647321eb5befc4c45a655a0ea2cdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9f8be197647321eb5befc4c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jul 3 10:58:57 2013 +0900 po: Update Korean translation. --- po/ko.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/ko.po b/po/ko.po index b001a9d..dc92e64 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13579,22 +13579,16 @@ msgid "Not yet implemented" msgstr "아직 구현안됨" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "만들기 실패함.\n" +msgstr "만든 날짜" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "접근이 금지되었습니다.\n" +msgstr "접근한 날짜" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "인증서 경로" +msgstr "고친 날짜" #: winefile.rc:109 msgid "Index/Inode" @@ -13602,7 +13596,7 @@ msgstr "인덱스/아이노드" #: winefile.rc:114 msgid "%1 of %2 free" -msgstr "%1 의 %2 사용가능" +msgstr "%2 의 %1 사용가능" #: winefile.rc:115 msgctxt "unit kilobyte"

1 0

Qian Hong : user32: Properly update caret position after result string is committed.
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 9ef2c648ee557d25d2598a42fdc7854101709f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef2c648ee557d25d2598a42f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Jul 3 03:54:41 2013 +0800 user32: Properly update caret position after result string is committed. --- dlls/user32/edit.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3e5a850..3634710 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4421,10 +4421,16 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) return; if (CompFlag & GCS_RESULTSTR) + { EDIT_GetResultStr(hIMC, es); - if (CompFlag & GCS_COMPSTR) - EDIT_GetCompositionStr(hIMC, CompFlag, es); - cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); + cursor = 0; + } + else + { + if (CompFlag & GCS_COMPSTR) + EDIT_GetCompositionStr(hIMC, CompFlag, es); + cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); + } ImmReleaseContext(hwnd, hIMC); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); }

1 0