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

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 60c1bd151ddc530a13e578ce06dcef1489e62acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c1bd151ddc530a13e578ce0… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:32:45 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 72 +++++++++++++++++++++++----------------------------------- 1 files changed, 29 insertions(+), 43 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 9ced8a8..5945942 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,13 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: N/A\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2012-07-07 00:06+0800\n" +"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" +"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" "Language: Chinese (Taiwan)\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" #: appwiz.rc:55 msgid "Install/Uninstall" @@ -21,24 +22,20 @@ msgstr "安裝/移除" msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要從軟碟，光碟或硬碟安裝新程式，請按「安裝」。" +msgstr "要從軟碟、光碟或硬碟安裝新程式，請按「安裝」。" #: appwiz.rc:59 msgid "&Install..." -msgstr "安裝(&I)..." +msgstr "安裝(&I)…" #: appwiz.rc:62 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。按「新增/移除」可以移除程式或者調整已安裝元件。" +"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" +"者調整已安裝元件。" #: appwiz.rc:64 msgid "&Support Information" @@ -46,7 +43,7 @@ msgstr "技術支援資訊(&S)" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." -msgstr "修改(&M)..." +msgstr "修改(&M)…" #: appwiz.rc:66 appwiz.rc:42 cryptui.rc:343 msacm32.rc:37 winecfg.rc:191 #: winecfg.rc:228 wordpad.rc:245 @@ -156,21 +153,10 @@ msgid "Cancel" msgstr "取消" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko 安裝程式" +msgstr "Wine Mono 安裝程式" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -179,11 +165,11 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine 需要安裝 Gecko 套件才能正確顯示嵌在應用程式中的 HTML 網頁。Wine 可以自動" -"幫您下載並安裝 Gecko。\n" +"Wine 需要安裝 Mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載並安" +"裝它。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"http://wiki.winehq.org/" -"Gecko\">http://wiki.winehq.org/Gecko</a>" +"Mono\">http://wiki.winehq.org/Mono</a>" #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -203,7 +189,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式「%s」。您想將這個移除程式從登錄檔中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中刪除嗎？" #: appwiz.rc:33 msgid "Not specified" @@ -240,17 +226,17 @@ msgstr "修改/移除(&M)" #: appwiz.rc:48 msgid "Downloading..." -msgstr "正在下載..." +msgstr "正在下載…" #: appwiz.rc:49 msgid "Installing..." -msgstr "正在安裝..." +msgstr "正在安裝…" #: appwiz.rc:50 msgid "" "Unexpected checksum of downloaded file. Aborting installation of corrupted " "file." -msgstr "" +msgstr "已下載檔案的總和檢查碼不符預期。放棄安裝已損壞檔案。" #: avifil32.rc:39 msgid "Compress options" @@ -262,7 +248,7 @@ msgstr "選擇來源(&C)：" #: avifil32.rc:45 wordpad.rc:73 msgid "&Options..." -msgstr "選項(&O)..." +msgstr "選項(&O)…" #: avifil32.rc:46 msgid "&Interleave every" @@ -306,7 +292,7 @@ msgstr "未壓縮" #: browseui.rc:25 msgid "Canceling..." -msgstr "正在取消..." +msgstr "正在取消…" #: comctl32.rc:49 winefile.rc:157 msgid "Properties for %s" @@ -357,7 +343,7 @@ msgstr "重置(&e)" #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:79 #: winemine.rc:48 winhlp32.rc:53 wordpad.rc:91 msgid "&Help" -msgstr "說明(&H)" +msgstr "求助(&H)" #: comctl32.rc:84 msgid "Move &Up" @@ -432,7 +418,7 @@ msgstr "唯讀(&R)" #: comdlg32.rc:173 msgid "Save As..." -msgstr "另存新檔..." +msgstr "另存新檔…" #: comdlg32.rc:186 comdlg32.rc:141 msgid "Save As" @@ -485,7 +471,7 @@ msgstr "列印至檔案(&L)" #: comdlg32.rc:212 msgid "Condensed" -msgstr "" +msgstr "已壓縮" #: comdlg32.rc:218 comdlg32.rc:389 msgid "Print Setup" @@ -505,7 +491,7 @@ msgstr "[無]" #: comdlg32.rc:224 msgid "Specific &Printer" -msgstr "" +msgstr "特定的印表機(&P)" #: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31 msgid "Orientation" @@ -776,7 +762,7 @@ msgstr "下(&B)：" #: comdlg32.rc:448 msgid "P&rinter..." -msgstr "印表機(&R)..." +msgstr "印表機(&R)…" #: comdlg32.rc:456 msgid "Look &in:" @@ -892,7 +878,7 @@ msgstr "黑色" #: comdlg32.rc:118 wordpad.rc:115 msgid "Maroon" -msgstr "" +msgstr "暗紅" #: comdlg32.rc:119 wordpad.rc:116 msgid "Green" @@ -912,7 +898,7 @@ msgstr "紫色" #: comdlg32.rc:123 wordpad.rc:120 msgid "Teal" -msgstr "" +msgstr "藍綠" #: comdlg32.rc:124 wordpad.rc:121 msgid "Gray" @@ -940,7 +926,7 @@ msgstr "藍色" #: comdlg32.rc:130 wordpad.rc:127 msgid "Fuchsia" -msgstr "" +msgstr "桃紅" #: comdlg32.rc:131 wordpad.rc:128 msgid "Aqua" @@ -1020,7 +1006,7 @@ msgstr "" #: comdlg32.rc:137 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "" +msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" #: comdlg32.rc:138 ieframe.rc:32 msgid "&Save" @@ -1104,7 +1090,7 @@ msgstr "正在處理；" #: comdlg32.rc:95 msgid "Initializing; " -msgstr "正在啓動；" +msgstr "正在初始化；" #: comdlg32.rc:96 msgid "Warming up; "

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 659304097c959eb7cdcaee515fa59ecfd936f799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659304097c959eb7cdcaee515… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:33:07 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 713 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 374 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=659304097c959eb7cdcae…

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: d05f9109c8638d453d7138d3defdc339e2ccea46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f9109c8638d453d7138d3d… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:35:41 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 646 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 322 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d05f9109c8638d453d713…

1 0

Alexandre Julliard : opengl32/tests: Run more tests against the GDI renderer.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 55f9e9ff4ff27523355ef1e1579849989d8f9f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f9e9ff4ff27523355ef1e15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 00:22:24 2012 +0200 opengl32/tests: Run more tests against the GDI renderer. --- dlls/opengl32/tests/opengl.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 77b4cf5..53e9863 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -388,7 +388,6 @@ static void test_makecurrent(HDC winhdc) { BOOL ret; HGLRC hglrc; - DWORD error; hglrc = wglCreateContext(winhdc); ok( hglrc != 0, "wglCreateContext failed\n" ); @@ -411,9 +410,9 @@ static void test_makecurrent(HDC winhdc) SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, NULL ); ok( ret, "wglMakeCurrent failed\n" ); @@ -428,9 +427,9 @@ static void test_makecurrent(HDC winhdc) SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, hglrc ); ok( ret, "wglMakeCurrent failed\n" ); @@ -808,6 +807,7 @@ static void test_getprocaddress(HDC hdc) if (!gl_extension_supported(extensions, "GL_ARB_multitexture")) { skip("skipping test because lack of GL_ARB_multitexture support\n"); + return; } func = wglGetProcAddress("glActiveTextureARB"); @@ -1478,7 +1478,10 @@ START_TEST(opengl) * any WGL call :( On Wine this would work but not on real Windows because there can be different implementations (software, ICD, MCD). */ init_functions(); + test_getprocaddress(hdc); test_deletecontext(hwnd, hdc); + test_makecurrent(hdc); + /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) { @@ -1486,8 +1489,6 @@ START_TEST(opengl) return; } - test_getprocaddress(hdc); - test_makecurrent(hdc); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc);

1 0

Bruno Jesus : user32/tests: Update DlgDirList tests.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 81cbf29ef3f9a0164e861fdb908bb56e4edba22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cbf29ef3f9a0164e861fdb9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jul 12 20:41:16 2012 -0300 user32/tests: Update DlgDirList tests. Based on original patch from Christian Lupien. --- dlls/user32/tests/listbox.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 1d6e8a3..4be7604 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1335,6 +1335,27 @@ static void test_listbox_dlgdir(void) ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + /* Now test DlgDirSelectEx() in normal operation */ /* Fill with everything - drives, directory and all plain files. */

1 0

Dmitry Timoshkov : gdiplus: Make sure that 1bpp bitmap images get loaded in native format.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: eca107412c581c28dc198d0808949bc999197872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca107412c581c28dc198d080… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 11:47:57 2012 +0900 gdiplus: Make sure that 1bpp bitmap images get loaded in native format. --- dlls/gdiplus/image.c | 4 ++++ dlls/gdiplus/tests/image.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9b36280..18df589 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2908,6 +2908,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * } static const WICPixelFormatGUID * const wic_pixel_formats[] = { + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, @@ -2917,6 +2919,8 @@ static const WICPixelFormatGUID * const wic_pixel_formats[] = { }; static const PixelFormat wic_gdip_formats[] = { + PixelFormat1bppIndexed, + PixelFormat1bppIndexed, PixelFormat16bppRGB555, PixelFormat24bppRGB, PixelFormat32bppRGB, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1f5ace1..a735172 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3326,7 +3326,6 @@ static void test_tiff_palette(void) status = GdipGetImagePixelFormat(image, &format); expect(Ok, status); -todo_wine ok(format == PixelFormat1bppIndexed, "expected PixelFormat1bppIndexed, got %#x\n", format); status = GdipGetImagePaletteSize(image, &size); @@ -3337,13 +3336,12 @@ todo_wine GdipDisposeImage(image); return; } -todo_wine expect(sizeof(ColorPalette) + sizeof(ARGB), size); status = GdipGetImagePalette(image, &palette.pal, size); expect(Ok, status); - expect(0, palette.pal.Flags); todo_wine + expect(0, palette.pal.Flags); expect(2, palette.pal.Count); if (palette.pal.Count == 2) {

1 0

Dmitry Timoshkov : gdiplus: Fix palette flags for a not indexed 1-bpp image .
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: ebf31c0ac62c6de409af782df1f673583c5b129d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf31c0ac62c6de409af782df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 11:50:05 2012 +0900 gdiplus: Fix palette flags for a not indexed 1-bpp image. --- dlls/gdiplus/image.c | 3 +++ dlls/gdiplus/tests/image.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 18df589..f7bfd1a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2983,6 +2983,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr gdip_format = PixelFormat32bppARGB; IWICBitmapSource_Release(bmp_source); } + TRACE("%s => %#x\n", wine_dbgstr_guid(&wic_format), gdip_format); } if (SUCCEEDED(hr)) /* got source */ @@ -3063,6 +3064,8 @@ end: bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.stream = stream; + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) + bitmap->image.palette_flags = 0; /* Pin the source stream */ IStream_AddRef(stream); } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a735172..69970ec 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3340,7 +3340,6 @@ static void test_tiff_palette(void) status = GdipGetImagePalette(image, &palette.pal, size); expect(Ok, status); -todo_wine expect(0, palette.pal.Flags); expect(2, palette.pal.Count); if (palette.pal.Count == 2)

1 0

Hans Leidekker : msi/tests: Mark some test results as broken.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: cbd83d0307d601e3a0689e0e8b836b3b6afb89ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd83d0307d601e3a0689e0e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 16 18:40:40 2012 +0200 msi/tests: Mark some test results as broken. --- dlls/msi/tests/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e41bef4..9508ea8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6720,7 +6720,7 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "32-bit component key not removed\n"); + ok(res == ERROR_FILE_NOT_FOUND || broken(!res), "32-bit component key not removed\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); @@ -6747,7 +6747,7 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "32-bit component key not removed\n"); + ok(res == ERROR_FILE_NOT_FOUND || broken(!res), "32-bit component key not removed\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n");

1 0

Lucas Zawacki : joy.cpl: Correct joystick testing thread behavior.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 6e60adbf5b4d2f02475e231553149c2f9cc97acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e60adbf5b4d2f02475e23155… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 16 14:05:39 2012 -0300 joy.cpl: Correct joystick testing thread behavior. --- dlls/joy.cpl/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index eb8f982..e9b3a72 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -424,9 +424,11 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM } break; - case PSN_RESET: + case PSN_RESET: /* intentional fall-through */ + case PSN_KILLACTIVE: /* Stop input thread */ data->stop = TRUE; + MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, 0); CloseHandle(thread); break; }

1 0

Aric Stewart : usp10: Change OpenType_GSUB_GetFontLangaugeTags to OpenType_GetFontLanguageTags and load languages from GPOS table as well .
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 2123f049d30cad9d79867999eb49f46211e0e23c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2123f049d30cad9d79867999e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:42 2012 -0500 usp10: Change OpenType_GSUB_GetFontLangaugeTags to OpenType_GetFontLanguageTags and load languages from GPOS table as well. --- dlls/usp10/opentype.c | 92 ++++++++++++++++++++++++++++++++++++------- dlls/usp10/shape.c | 4 +- dlls/usp10/usp10_internal.h | 5 +- 3 files changed, 82 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1aa77c02..369cfcc 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -992,7 +992,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int i; - if (!script->language_count && script->gsub_table) + if (script->gsub_table) { DWORD offset; const OT_Script* table = script->gsub_table; @@ -1001,12 +1001,12 @@ static void GSUB_initialize_language_cache(LoadedScript *script) if (offset) { script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.table = (const BYTE*)table + offset; + script->default_language.gsub_table = (const BYTE*)table + offset; } if (script->language_count) { - TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); + TRACE("Deflang %p, LangCount %i\n",script->default_language.gsub_table, script->language_count); script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); @@ -1014,13 +1014,79 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].table = ((const BYTE*)table + offset); + script->languages[i].gsub_table = ((const BYTE*)table + offset); } } } } -HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table) +static void GPOS_expand_language_cache(LoadedScript *script) +{ + int count; + const OT_Script* table = script->gpos_table; + DWORD offset; + + if (!table) + return; + + offset = GET_BE_WORD(table->DefaultLangSys); + if (offset) + script->default_language.gpos_table = (const BYTE*)table + offset; + + count = GET_BE_WORD(table->LangSysCount); + + TRACE("Deflang %p, LangCount %i\n",script->default_language.gpos_table, count); + if (!script->language_count) + { + int i; + script->language_count = count; + + script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + + for (i = 0; i < script->language_count; i++) + { + int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].gpos_table = ((const BYTE*)table + offset); + } + } + else if (count) + { + int i,j; + for (i = 0; i < count; i++) + { + int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); + OPENTYPE_TAG tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + + for (j = 0; j < script->language_count; j++) + { + if (script->languages[j].tag == tag) + { + script->languages[j].gpos_table = ((const BYTE*)table + offset); + break; + } + } + if (j == script->language_count) + { + script->language_count++; + script->languages = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,script->languages, sizeof(LoadedLanguage) * script->language_count); + script->languages[j].tag = tag; + script->languages[j].gpos_table = ((const BYTE*)table + offset); + } + } + } +} + +static void _initialize_language_cache(LoadedScript *script) +{ + if (!script->language_count) + { + GSUB_initialize_language_cache(script); + GPOS_expand_language_cache(script); + } +} + +HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) { int i; HRESULT rc = S_OK; @@ -1040,7 +1106,7 @@ HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_ if (!script) return E_INVALIDARG; - GSUB_initialize_language_cache(script); + _initialize_language_cache(script); if (!searchingFor && cMaxTags < script->language_count) rc = E_OUTOFMEMORY; @@ -1060,15 +1126,13 @@ HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_ { pLanguageTags[0] = script->languages[i].tag; *pcTags = 1; - if (language_table) - *language_table = script->languages[i].table; rc = S_OK; break; } } } - if (script->default_language.table) + if (script->default_language.gsub_table) { if (i < cMaxTags) pLanguageTags[i] = script->default_language.tag; @@ -1076,8 +1140,6 @@ HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_ if (searchingFor && FAILED(rc)) { pLanguageTags[0] = script->default_language.tag; - if (language_table) - *language_table = script->default_language.table; } i++; *pcTags = (*pcTags) + 1; @@ -1091,9 +1153,9 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag { int i; - if (!language->feature_count) + if (!language->feature_count && language->gsub_table) { - const OT_LangSys *lang= language->table; + const OT_LangSys *lang = language->gsub_table; const GSUB_Header *header = (const GSUB_Header *)table; const OT_FeatureList *feature_list; @@ -1151,9 +1213,9 @@ HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_t return E_INVALIDARG; } - GSUB_initialize_language_cache(script); + _initialize_language_cache(script); - if (script->default_language.table && script->default_language.tag == language_tag) + if (script->default_language.gsub_table && script->default_language.tag == language_tag) language = &script->default_language; else { diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b7d2822..1655992 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3264,11 +3264,11 @@ HRESULT SHAPE_GetFontLanguageTags( HDC hdc, ScriptCache *psc, if (psa && psc->userLang != 0) searching = psc->userLang; - hr = OpenType_GSUB_GetFontLanguageTags(psc, tagScript, searching, cMaxTags, pLangSysTags, pcTags, NULL); + hr = OpenType_GetFontLanguageTags(psc, tagScript, searching, cMaxTags, pLangSysTags, pcTags); if (FAILED(hr)) { fellback = TRUE; - hr = OpenType_GSUB_GetFontLanguageTags(psc, MS_MAKE_TAG('l','a','t','n'), searching, cMaxTags, pLangSysTags, pcTags, NULL); + hr = OpenType_GetFontLanguageTags(psc, MS_MAKE_TAG('l','a','t','n'), searching, cMaxTags, pLangSysTags, pcTags); } if (FAILED(hr) || fellback) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 3cb48d8..4077833 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -137,7 +137,8 @@ typedef struct { typedef struct { OPENTYPE_TAG tag; - LPCVOID table; + LPCVOID gsub_table; + LPCVOID gpos_table; INT feature_count; LoadedFeature *features; } LoadedLanguage; @@ -236,5 +237,5 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) DECLSPEC_HIDDEN; HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; -HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table) DECLSPEC_HIDDEN; +HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) DECLSPEC_HIDDEN; HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN;

1 0