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

Dmitry Timoshkov : gdiplus/tests: Add GdipGetClipBounds tests.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: e1572f9cd15bb44e1067569a570b19e5f2aee69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1572f9cd15bb44e1067569a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 4 18:34:57 2013 +0900 gdiplus/tests: Add GdipGetClipBounds tests. --- dlls/gdiplus/tests/graphics.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6ed1463..e12cac0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4521,6 +4521,64 @@ static void test_bitmapfromgraphics(void) GdipDisposeImage((GpImage*)bitmap); } +static void test_clipping(void) +{ + HDC hdc; + GpStatus status; + GpGraphics *graphics; + GpRegion *region; + GpMatrix *matrix; + GpRectF rect; + + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateRegion(&region); + expect(Ok, status); + status = GdipSetEmpty(region); + expect(Ok, status); + + rect.X = rect.Y = 100.0; + rect.Width = rect.Height = 100.0; + status = GdipCombineRegionRect(region, &rect, CombineModeUnion); + expect(Ok, status); + status = GdipSetClipRegion(graphics, region, CombineModeReplace); + expect(Ok, status); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); + expectf(100.0, rect.X); + expectf(100.0, rect.Y); + expectf(100.0, rect.Width); + expectf(100.0, rect.Height); + + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + status = GdipScaleMatrix(matrix, 2.0, 4.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipTranslateMatrix(matrix, 10.0, 20.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); +todo_wine + expectf(45.0, rect.X); +todo_wine + expectf(20.0, rect.Y); +todo_wine + expectf(50.0, rect.Width); +todo_wine + expectf(25.0, rect.Height); + + GdipDeleteMatrix(matrix); + GdipDeleteRegion(region); + GdipDeleteGraphics(graphics); + DeleteDC(hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4547,6 +4605,7 @@ START_TEST(graphics) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_clipping(); test_measured_extra_space(); test_measure_string(); test_font_height_scaling();

1 0

John Chadwick : msxml3/tests: Add additional xpath conformance tests.
by Alexandre Julliard 08 Jul '13

08 Jul '13

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

Piotr Caban : gdiplus: Add support for more string formats while getting font name.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: f37027a94793f52abda58ca1d270fd0133c80c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37027a94793f52abda58ca1d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 4 15:26:25 2013 +0200 gdiplus: Add support for more string formats while getting font name. --- dlls/gdiplus/font.c | 371 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 292 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f37027a94793f52abda58…

1 0

Alexandre Julliard : kernel32: Acquire the loader lock before shutting down the process.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: c01574d426888cac336483c9420f066d46a7f1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01574d426888cac336483c94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 8 14:23:03 2013 +0200 kernel32: Acquire the loader lock before shutting down the process. --- dlls/kernel32/process.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d07065c..6d2f80d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2630,6 +2630,8 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr void WINAPI process_ExitProcess( DWORD status ) { + ULONG magic; + LdrLockLoaderLock( 0, 0, &magic ); RtlAcquirePebLock(); NtTerminateProcess(0, status); LdrShutdownProcess();

1 0

Francois Gouget : po: Use three dots instead of the Unicode ellipsis character.
by Alexandre Julliard 08 Jul '13

08 Jul '13

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 08 Jul '13

08 Jul '13

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

André Hentschel : msvcrt: Remove superfluous casts.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: e931b5d17ee481798a72de2bd3103ed2d7afb131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e931b5d17ee481798a72de2bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 2 20:59:04 2013 +0200 msvcrt: Remove superfluous casts. --- dlls/msvcrt/cpp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 0fbdf5f..a3ee6b9 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -87,7 +87,7 @@ static void dump_obj_locator( const rtti_object_locator *ptr ) static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? (char*)RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; + char *base = ptr->signature == 0 ? RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); @@ -864,7 +864,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) char *base; if(obj_locator->signature == 0) - base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator; @@ -992,7 +992,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); if(obj_locator->signature == 0) - base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator;

1 0

Qian Hong : user32: Properly update caret position after result string is committed.
by Alexandre Julliard 03 Jul '13

03 Jul '13

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

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 03 Jul '13

03 Jul '13

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

Akihiro Sagawa : po: Use English shell path names in Japanese locale.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 2633b3bc894de49786d2f08c4fcb0603763b2f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2633b3bc894de49786d2f08c4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 4 00:27:18 2013 +0900 po: Use English shell path names in Japanese locale. --- po/ja.po | 63 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1373b97..9ff9cb8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,15 +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: 2013-07-02 23:19+0900\n" -"Last-Translator: Akira Nakagawa <matyapiro31(a)yahoo.co.jp>\n" +"PO-Revision-Date: 2013-07-03 23:54+0900\n" +"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" #: appwiz.rc:55 msgid "Install/Uninstall" @@ -7912,48 +7911,48 @@ msgstr "プログラム" #: shell32.rc:201 msgid "My Documents" -msgstr "マイドキュメント" +msgstr "My Documents" #: shell32.rc:202 msgid "Favorites" -msgstr "お気に入り" +msgstr "Favorites" #: shell32.rc:203 msgid "StartUp" -msgstr "スタートアップ" +msgstr "StartUp" #: shell32.rc:204 msgid "Start Menu" -msgstr "スタートメニュー" +msgstr "Start Menu" #: shell32.rc:205 msgid "My Music" -msgstr "マイミュージック" +msgstr "My Music" #: shell32.rc:206 msgid "My Videos" -msgstr "マイビデオ" +msgstr "My Videos" #: shell32.rc:207 msgctxt "directory" msgid "Desktop" -msgstr "デスクトップ" +msgstr "Desktop" #: shell32.rc:208 msgid "NetHood" -msgstr "ネットワーク内" +msgstr "NetHood" #: shell32.rc:209 msgid "Templates" -msgstr "テンプレート" +msgstr "Templates" #: shell32.rc:210 msgid "PrintHood" -msgstr "プリンタ内" +msgstr "PrintHood" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "ヒストリ" +msgstr "History" #: shell32.rc:212 msgid "Program Files" @@ -7961,7 +7960,7 @@ msgstr "Program Files" #: shell32.rc:214 msgid "My Pictures" -msgstr "マイピクチャ" +msgstr "My Pictures" #: shell32.rc:215 msgid "Common Files" @@ -7969,23 +7968,23 @@ msgstr "Common Files" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "ドキュメント" +msgstr "Documents" #: shell32.rc:217 msgid "Administrative Tools" -msgstr "管理者用ツール" +msgstr "Administrative Tools" #: shell32.rc:218 msgid "Music" -msgstr "ミュージック" +msgstr "Music" #: shell32.rc:219 msgid "Pictures" -msgstr "ピクチャ" +msgstr "Pictures" #: shell32.rc:220 msgid "Videos" -msgstr "ビデオ" +msgstr "Videos" #: shell32.rc:213 msgid "Program Files (x86)" @@ -7993,19 +7992,19 @@ msgstr "Program Files (x86)" #: shell32.rc:221 msgid "Contacts" -msgstr "連絡先" +msgstr "Contacs" #: shell32.rc:222 winefile.rc:110 msgid "Links" -msgstr "リンク" +msgstr "Links" #: shell32.rc:223 msgid "Slide Shows" -msgstr "スライドショー" +msgstr "Slide Shows" #: shell32.rc:224 msgid "Playlists" -msgstr "プレイリスト" +msgstr "Playlists" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -8021,35 +8020,35 @@ msgstr "機種名" #: shell32.rc:225 msgid "Sample Music" -msgstr "サンプルミュージック" +msgstr "Sample Music" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "サンプルピクチャ" +msgstr "Sample Pictures" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "サンプルプレイリスト" +msgstr "Sample Playlists" #: shell32.rc:228 msgid "Sample Videos" -msgstr "サンプルビデオ" +msgstr "Sample Videos" #: shell32.rc:229 msgid "Saved Games" -msgstr "保存済みのゲーム" +msgstr "Saved Games" #: shell32.rc:230 msgid "Searches" -msgstr "検索" +msgstr "Searches" #: shell32.rc:231 msgid "Users" -msgstr "ユーザー" +msgstr "Users" #: shell32.rc:233 msgid "Downloads" -msgstr "ダウンロード" +msgstr "Downloads" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied."

1 0