February 2012 - Wine-Commits

Frédéric Delanoy : po: Remove untranslated English strings from the Danish translation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 534f931cc7834b2a1d28ed3992116b058d66190d URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f931cc7834b2a1d28ed399… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 8 18:52:18 2012 +0100 po: Remove untranslated English strings from the Danish translation. --- po/da.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index fa832ee..4b2fb1c 100644 --- a/po/da.po +++ b/po/da.po @@ -484,7 +484,7 @@ msgstr "&Standardprinter" #: comdlg32.rc:223 msgid "[none]" -msgstr "[none]" +msgstr "" #: comdlg32.rc:224 msgid "Specific &Printer" @@ -608,7 +608,7 @@ msgstr "&Definer selvvalgt farve >>" #: comdlg32.rc:310 regedit.rc:223 regedit.rc:233 msgid "Find" -msgstr "Find" +msgstr "" #: comdlg32.rc:313 comdlg32.rc:332 msgid "Fi&nd What:" @@ -891,7 +891,7 @@ msgstr "Oliven" #: comdlg32.rc:121 wordpad.rc:118 msgid "Navy" -msgstr "Navy" +msgstr "" #: comdlg32.rc:122 wordpad.rc:119 msgid "Purple" @@ -4571,7 +4571,7 @@ msgstr "Service login mislykkedes\n" #: winerror.mc:1226 msgid "Service start-hang\n" -msgstr "Service start-hang\n" +msgstr "" #: winerror.mc:1231 msgid "Invalid service lock\n" @@ -6293,7 +6293,7 @@ msgstr "Kan ikke få fat i kald handle\n" #: winerror.mc:3311 msgid "Null reference pointer\n" -msgstr "Null reference pointer\n" +msgstr "" #: winerror.mc:3316 msgid "Enumeration value out of range\n" @@ -7427,7 +7427,7 @@ msgstr "Kopierer filer..." #: setupapi.rc:42 msgid "Destination:" -msgstr "Destination:" +msgstr "" #: setupapi.rc:49 msgid "Files Needed" @@ -10141,7 +10141,7 @@ msgstr "Tryk Return for at fortsætte: " #: cmd.rc:321 msgid "Wine Command Prompt" -msgstr "Wine Command Prompt" +msgstr "" #: cmd.rc:322 #, fuzzy @@ -11387,7 +11387,7 @@ msgstr "&Markeret del:" #: regedit.rc:226 msgid "Find:" -msgstr "Find:" +msgstr "" #: regedit.rc:228 msgid "Find in:" @@ -12879,7 +12879,7 @@ msgstr "Vis &advanceret" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12887,7 +12887,7 @@ msgstr "G&ennemse..." #: winecfg.rc:244 msgid "&Label:" -msgstr "&Label:" +msgstr "" #: winecfg.rc:246 msgid "S&erial:"

1 0

Frédéric Delanoy : taskmgr: Debug classes names are not translatable.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: d463243754a179b3a0389a09e5b91bd5f4d7b1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d463243754a179b3a0389a09e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 8 19:34:29 2012 +0100 taskmgr: Debug classes names are not translatable. --- po/ar.po | 196 +++++++++++++++++++----------------------- po/bg.po | 196 +++++++++++++++++++----------------------- po/ca.po | 196 +++++++++++++++++++----------------------- po/cs.po | 196 +++++++++++++++++++----------------------- po/da.po | 196 +++++++++++++++++++----------------------- po/de.po | 196 +++++++++++++++++++----------------------- po/el.po | 196 +++++++++++++++++++----------------------- po/en.po | 196 +++++++++++++++++++----------------------- po/en_US.po | 196 +++++++++++++++++++----------------------- po/eo.po | 196 +++++++++++++++++++----------------------- po/es.po | 201 ++++++++++++++++++++----------------------- po/fa.po | 196 +++++++++++++++++++----------------------- po/fi.po | 199 +++++++++++++++++++----------------------- po/fr.po | 196 +++++++++++++++++++----------------------- po/he.po | 196 +++++++++++++++++++----------------------- po/hi.po | 196 +++++++++++++++++++----------------------- po/hu.po | 197 +++++++++++++++++++----------------------- po/it.po | 196 +++++++++++++++++++----------------------- po/ja.po | 196 +++++++++++++++++++----------------------- po/ko.po | 196 +++++++++++++++++++----------------------- po/lt.po | 196 +++++++++++++++++++----------------------- po/ml.po | 196 +++++++++++++++++++----------------------- po/nb_NO.po | 196 +++++++++++++++++++----------------------- po/nl.po | 196 +++++++++++++++++++----------------------- po/or.po | 196 +++++++++++++++++++----------------------- po/pa.po | 196 +++++++++++++++++++----------------------- po/pl.po | 196 +++++++++++++++++++----------------------- po/pt_BR.po | 196 +++++++++++++++++++----------------------- po/pt_PT.po | 196 +++++++++++++++++++----------------------- po/rm.po | 196 +++++++++++++++++++----------------------- po/ro.po | 196 +++++++++++++++++++----------------------- po/ru.po | 196 +++++++++++++++++++----------------------- po/sk.po | 196 +++++++++++++++++++----------------------- po/sl.po | 196 +++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 197 +++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 197 +++++++++++++++++++----------------------- po/sv.po | 196 +++++++++++++++++++----------------------- po/te.po | 196 +++++++++++++++++++----------------------- po/th.po | 196 +++++++++++++++++++----------------------- po/tr.po | 196 +++++++++++++++++++----------------------- po/uk.po | 196 +++++++++++++++++++----------------------- po/wa.po | 196 +++++++++++++++++++----------------------- po/wine.pot | 196 +++++++++++++++++++----------------------- po/zh_CN.po | 197 +++++++++++++++++++----------------------- po/zh_TW.po | 197 +++++++++++++++++++----------------------- programs/taskmgr/dbgchnl.c | 13 +-- programs/taskmgr/resource.h | 4 - programs/taskmgr/taskmgr.rc | 4 - 48 files changed, 4057 insertions(+), 4797 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d463243754a179b3a0389…

1 0

Frédéric Delanoy : po: Remove untranslated English strings from the Polish translation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: e55bde601a9c91c71a2fabdfa688ffd394578cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55bde601a9c91c71a2fabdfa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 23:57:27 2012 +0100 po: Remove untranslated English strings from the Polish translation. --- po/pl.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/pl.po b/po/pl.po index 708dccc..ebbf2c8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3063,7 +3063,7 @@ msgstr "Skopiuj wybrane" #: gphoto2.rc:32 msgid "Preview" -msgstr "Preview" +msgstr "" #: gphoto2.rc:33 msgid "Import All" @@ -3071,7 +3071,7 @@ msgstr "Skopiuj wszystkie" #: gphoto2.rc:34 msgid "Skip This Dialog" -msgstr "Skip This Dialog" +msgstr "" #: gphoto2.rc:35 msgid "Exit" @@ -7984,15 +7984,15 @@ msgstr "Przykładowe wideo" #: shell32.rc:229 msgid "Saved Games" -msgstr "Saved Games" +msgstr "" #: shell32.rc:230 msgid "Searches" -msgstr "Searches" +msgstr "" #: shell32.rc:231 msgid "Users" -msgstr "Users" +msgstr "" #: shell32.rc:233 msgid "Downloads" @@ -10926,7 +10926,7 @@ msgstr "Zmień &ikonę..." #: progman.rc:189 msgid "Change Icon" -msgstr "Change Icon" +msgstr "" #: progman.rc:191 msgid "&Filename:"

1 0

Eric Pouech : kernel32: Added a couple of tests about console creation through CreateFile, and fix some corner cases.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: d967484ecc1f6a8c4f84b9d04a630c566d7c11ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d967484ecc1f6a8c4f84b9d04… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Feb 7 21:40:46 2012 +0100 kernel32: Added a couple of tests about console creation through CreateFile, and fix some corner cases. --- dlls/kernel32/file.c | 4 ++- dlls/kernel32/tests/console.c | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 194960b..a3b4411 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1286,7 +1286,9 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (!strcmpiW(filename, coninW) || !strcmpiW(filename, conoutW)) { - ret = OpenConsoleW(filename, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(filename, access, (sa && sa->bInheritHandle), + creation ? OPEN_EXISTING : 0); + if (ret == INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_PARAMETER); goto done; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f248666..7eea5d9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1116,6 +1116,68 @@ static void test_OpenConsoleW(void) CloseHandle(ret); } +static void test_CreateFileW(void) +{ + static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; + static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; + + static const struct + { + LPCWSTR name; + DWORD access; + BOOL inherit; + DWORD creation; + DWORD gle; + BOOL is_broken; + } cf_table[] = { + {coninW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {coninW, 0, FALSE, OPEN_ALWAYS, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, + {conoutW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {conoutW, 0, FALSE, OPEN_ALWAYS, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, + }; + + int index; + HANDLE ret; + SECURITY_ATTRIBUTES sa; + + for (index = 0; index < sizeof(cf_table)/sizeof(cf_table[0]); index++) + { + SetLastError(0xdeadbeef); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = cf_table[index].inherit; + + ret = CreateFileW(cf_table[index].name, cf_table[index].access, + FILE_SHARE_READ|FILE_SHARE_WRITE, &sa, + cf_table[index].creation, FILE_ATTRIBUTE_NORMAL, NULL); + if (ret == INVALID_HANDLE_VALUE) + { + ok(cf_table[index].gle, + "Expected CreateFileW not to return INVALID_HANDLE_VALUE for index %d\n", index); + ok(GetLastError() == cf_table[index].gle, + "Expected GetLastError() to return %u for index %d, got %u\n", + cf_table[index].gle, index, GetLastError()); + } + else + { + ok(!cf_table[index].gle || broken(cf_table[index].is_broken) /* Win7 */, + "Expected CreateFileW to succeed for index %d\n", index); + CloseHandle(ret); + } + } +} + static void test_VerifyConsoleIoHandle( HANDLE handle ) { BOOL ret; @@ -2546,6 +2608,7 @@ START_TEST(console) test_GetConsoleProcessList(); test_OpenConsoleW(); + test_CreateFileW(); test_OpenCON(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle();

1 0

Jacek Caban : mshtml: Removed code duplication in frame collection tests.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 666004cdbd5a73d76b8db4a4f3f40534b4b5a943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666004cdbd5a73d76b8db4a4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 8 15:57:53 2012 +0100 mshtml: Removed code duplication in frame collection tests. --- dlls/mshtml/tests/dom.c | 94 ++++++++++++----------------------------------- 1 files changed, 24 insertions(+), 70 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a847998..6ceb9ea 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5832,27 +5832,12 @@ static void test_frame(IDispatch *disp, const char *exp_id) IHTMLDocument2_Release(top_doc); } -static void test_frameset(IHTMLDocument2 *doc) +static void test_frames_collection(IHTMLFramesCollection2 *frames, const char *frid) { - IHTMLWindow2 *window; - IHTMLFramesCollection2 *frames; - IHTMLElement *elem; - IHTMLFrameBase *fbase; - LONG length; VARIANT index_var, result_var; - BSTR str; + LONG length; HRESULT hres; - window = get_doc_window(doc); - - /* test using IHTMLFramesCollection object */ - - hres = IHTMLWindow2_get_frames(window, &frames); - ok(hres == S_OK, "IHTMLWindow2_get_frames failed: 0x%08x\n", hres); - IHTMLWindow2_Release(window); - if(FAILED(hres)) - return; - /* test result length */ hres = IHTMLFramesCollection2_get_length(frames, &length); ok(hres == S_OK, "IHTMLFramesCollection2_get_length failed: 0x%08x\n", hres); @@ -5888,12 +5873,12 @@ static void test_frameset(IHTMLDocument2 *doc) /* string argument (element id lookup) */ V_VT(&index_var) = VT_BSTR; - V_BSTR(&index_var) = a2bstr("fr1"); + V_BSTR(&index_var) = a2bstr(frid); hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame(V_DISPATCH(&result_var), "fr1"); + test_frame(V_DISPATCH(&result_var), frid); } VariantClear(&result_var); VariantClear(&index_var); @@ -5905,63 +5890,31 @@ static void test_frameset(IHTMLDocument2 *doc) ok(hres == E_INVALIDARG, "IHTMLFramesCollection2_item should have" "failed with E_INVALIDARG, instead: 0x%08x\n", hres); VariantClear(&result_var); +} - IHTMLFramesCollection2_Release(frames); - - /* test using IHTMLWindow2 inheritance */ - - /* test result length */ - hres = IHTMLWindow2_get_length(window, &length); - ok(hres == S_OK, "IHTMLWindow2_get_length failed: 0x%08x\n", hres); - ok(length == 3, "IHTMLWindow2_get_length should have been 3, was: %d\n", length); +static void test_frameset(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + IHTMLFramesCollection2 *frames; + IHTMLElement *elem; + IHTMLFrameBase *fbase; + BSTR str; + HRESULT hres; - /* test first frame */ - V_VT(&index_var) = VT_I4; - V_I4(&index_var) = 0; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); - if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); - } - VariantClear(&result_var); + window = get_doc_window(doc); - /* test second frame */ - V_I4(&index_var) = 1; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); - if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); - } - VariantClear(&result_var); + /* test using IHTMLFramesCollection object */ - /* fail on next frame */ - V_I4(&index_var) = 3; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLWindow2_item should have" - "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08x\n", hres); - VariantClear(&result_var); + hres = IHTMLWindow2_get_frames(window, &frames); + ok(hres == S_OK, "IHTMLWindow2_get_frames failed: 0x%08x\n", hres); + if(FAILED(hres)) + return; - /* string argument (element id lookup) */ - V_VT(&index_var) = VT_BSTR; - V_BSTR(&index_var) = a2bstr("fr2"); - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); - if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); - } - VariantClear(&result_var); - VariantClear(&index_var); + test_frames_collection(frames, "fr1"); + IHTMLFramesCollection2_Release(frames); - /* invalid argument */ - V_VT(&index_var) = VT_BOOL; - V_BOOL(&index_var) = VARIANT_TRUE; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == E_INVALIDARG, "IHTMLWindow2_item should have" - "failed with E_INVALIDARG, instead: 0x%08x\n", hres); - VariantClear(&result_var); + /* test using IHTMLWindow2 inheritance */ + test_frames_collection((IHTMLFramesCollection2*)window, "fr2"); /* getElementById with node name attributes */ elem = get_doc_elem_by_id(doc, "nm1"); @@ -6018,6 +5971,7 @@ static void test_frameset(IHTMLDocument2 *doc) IHTMLFrameBase_Release(fbase); IHTMLElement_Release(elem); + IHTMLWindow2_Release(window); } static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::get_frames implementation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 976a3d5e08d595795ec3c9b7b9f9ca75fbac9e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=976a3d5e08d595795ec3c9b7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 8 15:58:21 2012 +0100 mshtml: Added IHTMLDocument2::get_frames implementation. --- dlls/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 039893e..46838d6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -471,8 +471,10 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLWindow2_get_frames(&This->window->IHTMLWindow2_iface, p); } static HRESULT WINAPI HTMLDocument_get_embeds(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6ceb9ea..8df47cc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5913,6 +5913,14 @@ static void test_frameset(IHTMLDocument2 *doc) test_frames_collection(frames, "fr1"); IHTMLFramesCollection2_Release(frames); + hres = IHTMLDocument2_get_frames(doc, &frames); + ok(hres == S_OK, "IHTMLDocument2_get_frames failed: 0x%08x\n", hres); + if(FAILED(hres)) + return; + + test_frames_collection(frames, "fr1"); + IHTMLFramesCollection2_Release(frames); + /* test using IHTMLWindow2 inheritance */ test_frames_collection((IHTMLFramesCollection2*)window, "fr2");

1 0

Akihiro Sagawa : gdi32/tests: Add tests for East Asian font selection.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: c683ad72b25443377f612548e3828744df0e64fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c683ad72b25443377f612548e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 9 01:32:58 2012 +0900 gdi32/tests: Add tests for East Asian font selection. --- dlls/gdi32/tests/font.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8d30cdb..52a1873 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4166,6 +4166,63 @@ static void test_vertical_font(void) DeleteFile(ttf_name); } +static INT CALLBACK has_vertical_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, + DWORD type, LPARAM lParam) +{ + if (lf->lfFaceName[0] == '@') { + return 0; + } + return 1; +} + +static void test_east_asian_font_selection(void) +{ + HDC hdc; + UINT charset[] = { SHIFTJIS_CHARSET, HANGEUL_CHARSET, JOHAB_CHARSET, + GB2312_CHARSET, CHINESEBIG5_CHARSET }; + size_t i; + + hdc = GetDC(NULL); + + for (i = 0; i < sizeof(charset)/sizeof(charset[0]); i++) + { + LOGFONTA lf; + HFONT hfont; + char face_name[LF_FACESIZE]; + int ret; + + memset(&lf, 0, sizeof lf); + lf.lfFaceName[0] = '\0'; + lf.lfCharSet = charset[i]; + + if (EnumFontFamiliesEx(hdc, &lf, has_vertical_font_proc, 0, 0)) + { + skip("Vertical font for charset %u is not installed\n", charset[i]); + continue; + } + + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + memset(face_name, 0, sizeof face_name); + ret = GetTextFaceA(hdc, sizeof face_name, face_name); + todo_wine ok(ret && face_name[0] != '@', + "expected non-vertical face for charset %u, got %s\n", charset[i], face_name); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof lf); + strcpy(lf.lfFaceName, "@"); + lf.lfCharSet = charset[i]; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + memset(face_name, 0, sizeof face_name); + ret = GetTextFaceA(hdc, sizeof face_name, face_name); + ok(ret && face_name[0] == '@', + "expected vertical face for charset %u, got %s\n", charset[i], face_name); + DeleteObject(SelectObject(hdc, hfont)); + } + ReleaseDC(NULL, hdc); +} + START_TEST(font) { init(); @@ -4220,6 +4277,7 @@ START_TEST(font) test_fullname(); test_vertical_font(); + test_east_asian_font_selection(); /* CreateScalableFontResource should be last test until RemoveFontResource * is properly implemented. */

1 0

Akihiro Sagawa : gdi32: Consider whether the logical font face is vertical when selecting.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 286854fb06aaf68ab43cc175555d927df96bc6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=286854fb06aaf68ab43cc1755… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 9 01:33:00 2012 +0900 gdi32: Consider whether the logical font face is vertical when selecting. --- dlls/gdi32/freetype.c | 9 ++++++--- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 55c82ba..5e6a952 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3982,7 +3982,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) INT height, width = 0; unsigned int score = 0, new_score; signed int diff = 0, newdiff; - BOOL bd, it, can_use_bitmap; + BOOL bd, it, can_use_bitmap, want_vertical; LOGFONTW lf; CHARSETINFO csi; HFONTLIST *hflist; @@ -4163,6 +4163,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) lf.lfCharSet = csi.ciCharset; } + want_vertical = (lf.lfFaceName[0] == '@'); + /* Face families are in the top 4 bits of lfPitchAndFamily, so mask with 0xF0 before testing */ @@ -4192,7 +4194,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) family = LIST_ENTRY(family_elem_ptr, Family, entry); LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) { + if(face->vertical == want_vertical && + (csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0]))) { if(face->scalable) goto found; if(can_use_bitmap && !last_resort_family) @@ -4211,7 +4214,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) family = LIST_ENTRY(family_elem_ptr, Family, entry); LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(face->scalable) { + if(face->scalable && face->vertical == want_vertical) { csi.fs.fsCsb[0] = 0; WARN("just using first face for now\n"); goto found; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 52a1873..307493b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4205,7 +4205,7 @@ static void test_east_asian_font_selection(void) hfont = SelectObject(hdc, hfont); memset(face_name, 0, sizeof face_name); ret = GetTextFaceA(hdc, sizeof face_name, face_name); - todo_wine ok(ret && face_name[0] != '@', + ok(ret && face_name[0] != '@', "expected non-vertical face for charset %u, got %s\n", charset[i], face_name); DeleteObject(SelectObject(hdc, hfont));

1 0

Alexandre Julliard : user32: Draw the mask with SRCCOPY in DrawIcon when the image isn't being drawn.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 8ab65c222e39e4c5cb6ce8ae943c982f93910487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab65c222e39e4c5cb6ce8ae9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 11:00:51 2012 -0600 user32: Draw the mask with SRCCOPY in DrawIcon when the image isn't being drawn. --- dlls/user32/cursoricon.c | 3 ++- dlls/user32/tests/cursoricon.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3a23a47..6002bbb 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2317,9 +2317,10 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_MASK) { + DWORD rop = (flags & DI_IMAGE) ? SRCAND : SRCCOPY; SelectObject( hMemDC, frame->mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, - hMemDC, 0, 0, frame->width, frame->height, SRCAND ); + hMemDC, 0, 0, frame->width, frame->height, rop ); } if (flags & DI_IMAGE) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 4a570ae..61937e8 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1926,8 +1926,8 @@ static void test_DrawIconEx(void) check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); - check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00000000, 0x00000000, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, __LINE__); + check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00123456, 0x00000000, 0x00000000, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00123456, 0x00FFFFFF, 0x00FFFFFF, __LINE__); check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__);

1 0

Alexandre Julliard : winecoreaudio: Fix spec file parameters.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 9ac28c8f3630b9da21e24f0cd0267ed64016f134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac28c8f3630b9da21e24f0cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 7 21:27:56 2012 -0600 winecoreaudio: Fix spec file parameters. --- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec index 489fd77..0f208e9 100644 --- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec +++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec @@ -5,6 +5,6 @@ # MMDevAPI driver functions @ stdcall -private GetPriority() AUDDRV_GetPriority -@ stdcall -private GetEndpointIDs(long ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioEndpoint(str long ptr) AUDDRV_GetAudioEndpoint +@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs +@ stdcall -private GetAudioEndpoint(str ptr long ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager

1 0