January 2011 - Wine-commits

Alexandre Julliard : winecfg: Build the file filter by hand instead of hardcoding it in resource strings .
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: adfab558ecf761ec415ba66a157a17cc71a61abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfab558ecf761ec415ba66a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 21:15:08 2011 +0100 winecfg: Build the file filter by hand instead of hardcoding it in resource strings. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 2 +- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 2 +- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sr.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Uk.rc | 2 +- programs/winecfg/Zh.rc | 2 +- programs/winecfg/appdefaults.c | 7 +++++-- 26 files changed, 30 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adfab558ecf761ec415ba…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: d8c833bc6d2370fba00d25724dcb4350eb3b032f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c833bc6d2370fba00d25724… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jan 13 20:41:58 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 135 ++++++++++--------------------------------------------------- 1 files changed, 22 insertions(+), 113 deletions(-) diff --git a/po/lt.po b/po/lt.po index 390e62d..7381e41 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: 2011-01-07 18:22+0300\n" +"PO-Revision-Date: 2011-01-13 20:37+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)gmail.com>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -132,13 +132,8 @@ msgid "Separator" msgstr "Skirtukas" #: comctl32.rc:44 crypt32.rc:198 progman.rc:83 -#, fuzzy msgid "None" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Nėra\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Joks" +msgstr "Nėra" #: comctl32.rc:28 wordpad.rc:169 msgid "Close" @@ -727,13 +722,8 @@ msgid "IP security IKE intermediate" msgstr "IP saugumo IKE tarpininkas" #: crypt32.rc:161 cryptui.rc:129 -#, fuzzy msgid "File Recovery" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Failo atkūrimas\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Failų atkūrimas" +msgstr "Failų atkūrimas" #: crypt32.rc:162 cryptui.rc:134 msgid "Root List Signer" @@ -1655,13 +1645,8 @@ msgid "Back" msgstr "Atgal" #: hhctrl.rc:40 shdocvw.rc:67 -#, fuzzy msgid "Home" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Į pradžią\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Pradžia" +msgstr "Į pradžią" #: hhctrl.rc:41 msgid "Sync" @@ -1852,13 +1837,8 @@ msgid "Array object expected" msgstr "Tikėtasi masyvo objekto" #: localspl.rc:28 localui.rc:28 winspool.rc:27 -#, fuzzy msgid "Local Port" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Vietinis prievadas\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Lokalus prievadas" +msgstr "Vietinis prievadas" #: localspl.rc:29 msgid "Local Monitor" @@ -2415,13 +2395,8 @@ msgid "Type the path where the file is located, and then click OK." msgstr "Įveskite kelią iki failo, o tada spauskite Gerai." #: shdoclc.rc:36 winhlp32.rc:47 winhlp32.rc:83 -#, fuzzy msgid "Default" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Numatytasis\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Numatyta" +msgstr "Numatyta" #: shdoclc.rc:38 winhlp32.rc:101 msgid "&Back" @@ -2448,13 +2423,8 @@ msgid "Set as &Desktop Item" msgstr "Nustatyti da&rbalaukio elementu" #: shdoclc.rc:46 shdoclc.rc:98 shdoclc.rc:121 user32.rc:49 -#, fuzzy msgid "Select &All" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Pažymėti &viską\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Pažymėti viską" +msgstr "Pažymėti &viską" #: shdoclc.rc:47 shdoclc.rc:80 shdoclc.rc:94 shdoclc.rc:136 shdoclc.rc:164 #: shdoclc.rc:189 user32.rc:46 wineconsole.rc:30 wordpad.rc:103 @@ -2486,13 +2456,8 @@ msgid "&Refresh" msgstr "Atsiųsti iš &naujo" #: shdoclc.rc:59 shell32.rc:93 clock.rc:28 wineconsole.rc:27 -#, fuzzy msgid "&Properties" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Savy&bės\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Savybės" +msgstr "&Savybės" #: shdoclc.rc:62 msgid "Image" @@ -2573,13 +2538,8 @@ msgid "&Undo" msgstr "&Atšaukti" #: shdoclc.rc:95 shell32.rc:90 user32.rc:47 -#, fuzzy msgid "&Delete" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Šalinti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Iš&valyti" +msgstr "&Šalinti" #: shdoclc.rc:101 msgid "Table" @@ -2623,13 +2583,8 @@ msgid "1DSite Select" msgstr "1DPuslapio žymėjimas" #: shdoclc.rc:120 shell32.rc:61 -#, fuzzy msgid "Paste" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Į&dėti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Įdėti" +msgstr "Į&dėti" #: shdoclc.rc:122 winhlp32.rc:31 msgid "&Print" @@ -2978,13 +2933,8 @@ msgid "&Rename" msgstr "&Pervadinti" #: shell32.rc:102 notepad.rc:36 view.rc:31 winhlp32.rc:34 wordpad.rc:37 -#, fuzzy msgid "E&xit" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Iš&eiti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Išeiti" +msgstr "Iš&eiti" #: shell32.rc:115 msgid "&About Control Panel..." @@ -3003,13 +2953,8 @@ msgid "Modified" msgstr "Modifikuotas" #: shell32.rc:126 winefile.rc:167 -#, fuzzy msgid "Attributes" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Požymiai\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Atributai" +msgstr "Požymiai" #: shell32.rc:128 msgid "Size available" @@ -3188,13 +3133,8 @@ msgid "Contacts" msgstr "Kontaktai" #: shell32.rc:216 winefile.rc:166 -#, fuzzy msgid "Links" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Saitai\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Nuorodos" +msgstr "Saitai" #: shell32.rc:217 msgid "Pictures\\Slide Shows" @@ -3423,13 +3363,8 @@ msgid " sec" msgstr " sek" #: user32.rc:27 taskmgr.rc:139 -#, fuzzy msgid "&Restore" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Atkurti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"A&tkurti" +msgstr "&Atkurti" #: user32.rc:28 msgid "&Move" @@ -3444,13 +3379,8 @@ msgid "Mi&nimize" msgstr "Su&skleisti" #: user32.rc:31 taskmgr.rc:83 taskmgr.rc:100 taskmgr.rc:127 -#, fuzzy msgid "Ma&ximize" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Išskleisti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Pa&didinti" +msgstr "Pa&didinti" #: user32.rc:33 msgid "&Close\tAlt-F4" @@ -3458,7 +3388,7 @@ msgstr "&Užverti\tAlt-F4" #: user32.rc:35 msgid "&About Wine..." -msgstr "&Apie Wine..." +msgstr "Apie &Wine..." #: user32.rc:55 winefile.rc:148 msgid "Error" @@ -4360,13 +4290,8 @@ msgid "Digi&tal" msgstr "Skai&tmeninis" #: clock.rc:32 notepad.rc:50 winefile.rc:97 wordpad.rc:81 -#, fuzzy msgid "&Font..." -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Šriftas...\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Š&riftas..." +msgstr "Š&riftas..." #: clock.rc:34 msgid "&Without Titlebar" @@ -4487,8 +4412,7 @@ msgid "" "The requirement to double the % sign when using FOR in a batch file does\n" "not exist in wine's cmd.\n" msgstr "" -"FOR komanda yra naudojama įvykdyti komandą kiekvienam failų aibės " -"elementui.\n" +"FOR komanda yra naudojama įvykdyti komandą kiekvienam failų aibės elementui.\n" "\n" "Sintaksė: FOR %kintamasis IN (aibė) DO komanda\n" "\n" @@ -5391,13 +5315,8 @@ msgid "O&pen\tEnter" msgstr "&Atverti\tEnter" #: progman.rc:32 winefile.rc:27 -#, fuzzy msgid "&Move...\tF7" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Perkelti...\tF7\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Pe&rkelti...\tF7" +msgstr "Pe&rkelti...\tF7" #: progman.rc:33 winefile.rc:28 msgid "&Copy...\tF8" @@ -5428,22 +5347,12 @@ msgid "&Arrange automatically" msgstr "Išdėstyti &automatiškai" #: progman.rc:43 winefile.rc:107 -#, fuzzy msgid "&Minimize on run" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Suskleisti paleidžiant\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Suskleisti vykdant" +msgstr "&Suskleisti paleidžiant" #: progman.rc:44 winefile.rc:108 -#, fuzzy msgid "&Save settings on exit" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Išsaugoti &nuostatas išeinant\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Išeinant išsaugoti nuostatas" +msgstr "Išsaugoti &nuostatas išeinant" #: progman.rc:46 taskmgr.rc:78 taskmgr.rc:256 msgid "&Windows" @@ -5471,7 +5380,7 @@ msgstr "&Mokymo programa" #: progman.rc:59 msgid "&About Wine" -msgstr "&Apie Wine" +msgstr "Apie &Wine" #: progman.rc:65 msgid "Program Manager"

1 0

Piotr Caban : shell32: Don' t check if files are of the same type if name is equal in IShellFolder2_CompareIDs .
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 856da7e11dec4f026c641d9fc7463fdadc04d98d URL: http://source.winehq.org/git/wine.git/?a=commit;h=856da7e11dec4f026c641d9fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 13 15:32:07 2011 +0100 shell32: Don't check if files are of the same type if name is equal in IShellFolder2_CompareIDs. --- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index c779084..1c9b672 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1038,15 +1038,15 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_CompareIDs(IShellFolder2* iface, else if (isEmpty2) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)1); - if (_ILIsFolder(pidl1) && !_ILIsFolder(pidl2)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)-1); - if (!_ILIsFolder(pidl1) && _ILIsFolder(pidl2)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)1); - compare = CompareStringA(LOCALE_USER_DEFAULT, NORM_IGNORECASE, _ILGetTextPointer(pidl1), -1, _ILGetTextPointer(pidl2), -1); - + + if ((compare != CSTR_EQUAL) && _ILIsFolder(pidl1) && !_ILIsFolder(pidl2)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)-1); + if ((compare != CSTR_EQUAL) && !_ILIsFolder(pidl1) && _ILIsFolder(pidl2)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)1); + if ((compare == CSTR_LESS_THAN) || (compare == CSTR_GREATER_THAN)) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD)((compare == CSTR_LESS_THAN)?-1:1));

1 0

Hans Leidekker : msi: Fix some memory leaks (valgrind).
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 257beae1fd7d5a60ecf64f9978e9222f62958d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=257beae1fd7d5a60ecf64f997… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 13 15:23:21 2011 +0100 msi: Fix some memory leaks (valgrind). --- dlls/msi/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c7e1f98..5606d28 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -112,6 +112,9 @@ static void free_extension( MSIEXTENSION *ext ) static void free_assembly( MSIASSEMBLY *assembly ) { + msi_free( assembly->feature ); + msi_free( assembly->manifest ); + msi_free( assembly->application ); msi_free( assembly->display_name ); if (assembly->tempdir) RemoveDirectoryW( assembly->tempdir ); msi_free( assembly->tempdir );

1 0

Hans Leidekker : msi/tests: Accept one more estimated size.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: e6e454ab162293414b8ece64c4f4abce29f916f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e454ab162293414b8ece64c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 13 15:23:40 2011 +0100 msi/tests: Accept one more estimated size. --- dlls/msi/tests/action.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 4ab5df6..241a917 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2417,7 +2417,7 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } -static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD line) +static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line) { DWORD val, size, type; LONG res; @@ -2431,10 +2431,12 @@ static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e return; } - ok_(__FILE__, line)(val == expected1 || val == expected2, "Expected %d or %d, got %d\n", expected1, expected2, val); + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3, + "Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val); } -static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line) +static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, + DWORD expected4, DWORD line) { DWORD val, size, type; LONG res; @@ -2448,8 +2450,8 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e return; } - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3, - "Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val); + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, + "Expected %d, %d or %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); } #define CHECK_REG_STR(prodkey, name, expected) \ @@ -2487,6 +2489,10 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); \ RegDeleteValueA(prodkey, name); +#define CHECK_DEL_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ + check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); \ + RegDeleteValueA(prodkey, name); + static void get_date_str(LPSTR date) { SYSTEMTIME systime; @@ -2590,7 +2596,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); } delete_key(hkey, "", access); @@ -2628,7 +2634,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); } delete_key(props, "", access); @@ -2697,7 +2703,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); } delete_key(hkey, "", access); @@ -2735,7 +2741,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); + CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); } delete_key(props, "", access); @@ -3578,7 +3584,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3660,7 +3666,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3743,7 +3749,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3803,7 +3809,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey); @@ -3863,7 +3869,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -20); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -20, 10); } RegCloseKey(prodkey); @@ -3946,7 +3952,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); + CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); } RegCloseKey(prodkey);

1 0

Piotr Caban : shell32: Try to get file status from FileSystemBindData in UNIXFS_path_to_pidl.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: ad2201054c43d89f614d123e906a3dee02b8c071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2201054c43d89f614d123e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 13 15:31:52 2011 +0100 shell32: Try to get file status from FileSystemBindData in UNIXFS_path_to_pidl. --- dlls/shell32/shfldr_unixfs.c | 114 ++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 53 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 628ab87..c779084 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -462,28 +462,6 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) } /****************************************************************************** - * UNIXFS_seconds_since_1970_to_dos_date_time [Internal] - * - * Convert unix time to FAT time - * - * PARAMS - * ss1970 [I] Unix time (seconds since 1970) - * pDate [O] Corresponding FAT date - * pTime [O] Corresponding FAT time - */ -static inline void UNIXFS_seconds_since_1970_to_dos_date_time( - time_t ss1970, LPWORD pDate, LPWORD pTime) -{ - LARGE_INTEGER time; - FILETIME fileTime; - - RtlSecondsSince1970ToTime( ss1970, &time ); - fileTime.dwLowDateTime = time.u.LowPart; - fileTime.dwHighDateTime = time.u.HighPart; - FileTimeToDosDateTime(&fileTime, pDate, pTime); -} - -/****************************************************************************** * UNIXFS_build_shitemid [Internal] * * Constructs a new SHITEMID for the last component of path 'pszUnixPath' into @@ -503,44 +481,51 @@ static inline void UNIXFS_seconds_since_1970_to_dos_date_time( * If what you need is a PIDLLIST with a single SHITEMID, don't forget to append * a 0 USHORT value. */ -static char* UNIXFS_build_shitemid(char *pszUnixPath, LPBC pbc, void *pIDL) { +static char* UNIXFS_build_shitemid(char *pszUnixPath, BOOL bMustExist, WIN32_FIND_DATAW *pFindData, void *pIDL) { LPPIDLDATA pIDLData; struct stat fileStat; + WIN32_FIND_DATAW findData; char *pszComponentU, *pszComponentA; WCHAR *pwszComponentW; int cComponentULen, cComponentALen; USHORT cbLen; FileStructW *pFileStructW; WORD uOffsetW, *pOffsetW; - BOOL must_exist = TRUE; - TRACE("(pszUnixPath=%s, pbc=%p, pIDL=%p)\n", debugstr_a(pszUnixPath), pbc, pIDL); + TRACE("(pszUnixPath=%s, bMustExsist=%s, pFindData=%p, pIDL=%p)\n", + debugstr_a(pszUnixPath), bMustExist ? "T" : "F", pFindData, pIDL); - if (pbc){ - IUnknown *unk; - IFileSystemBindData *fsb; - HRESULT hr; - - hr = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &unk); - if (SUCCEEDED(hr)) { - hr = IUnknown_QueryInterface(unk, &IID_IFileSystemBindData, (LPVOID*)&fsb); - if (SUCCEEDED(hr)) { - /* Windows tries to get WIN32_FIND_DATAW structure from - * fsb here for no known reason */ - must_exist = FALSE; - IFileSystemBindData_Release(fsb); - } - IUnknown_Release(unk); - } + if (pFindData) + memcpy(&findData, pFindData, sizeof(WIN32_FIND_DATAW)); + else { + memset(&findData, 0, sizeof(WIN32_FIND_DATAW)); + findData.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; } /* We are only interested in regular files and directories. */ if (stat(pszUnixPath, &fileStat)){ - if (must_exist || errno != ENOENT) + if (bMustExist || errno != ENOENT) return NULL; - }else - if (!S_ISDIR(fileStat.st_mode) && !S_ISREG(fileStat.st_mode)) + } else { + LARGE_INTEGER time; + + if (S_ISDIR(fileStat.st_mode)) + findData.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; + else if (S_ISREG(fileStat.st_mode)) + findData.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + else return NULL; + + findData.nFileSizeLow = (DWORD)fileStat.st_size; + findData.nFileSizeHigh = fileStat.st_size >> 32; + + RtlSecondsSince1970ToTime(fileStat.st_mtime, &time); + findData.ftLastWriteTime.dwLowDateTime = time.u.LowPart; + findData.ftLastWriteTime.dwHighDateTime = time.u.HighPart; + RtlSecondsSince1970ToTime(fileStat.st_atime, &time); + findData.ftLastAccessTime.dwLowDateTime = time.u.LowPart; + findData.ftLastAccessTime.dwHighDateTime = time.u.HighPart; + } /* Compute the SHITEMID's length and wipe it. */ pszComponentU = strrchr(pszUnixPath, '/') + 1; @@ -552,12 +537,12 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, LPBC pbc, void *pIDL) { /* Set shell32's standard SHITEMID data fields. */ pIDLData = _ILGetDataPointer(pIDL); - pIDLData->type = S_ISDIR(fileStat.st_mode) ? PT_FOLDER : PT_VALUE; - pIDLData->u.file.dwFileSize = (DWORD)fileStat.st_size; - UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_mtime, &pIDLData->u.file.uFileDate, - &pIDLData->u.file.uFileTime); + pIDLData->type = (findData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) ? PT_FOLDER : PT_VALUE; + pIDLData->u.file.dwFileSize = findData.nFileSizeLow; + FileTimeToDosDateTime(&findData.ftLastWriteTime, &pIDLData->u.file.uFileDate, + &pIDLData->u.file.uFileTime); pIDLData->u.file.uFileAttribs = 0; - if (S_ISDIR(fileStat.st_mode)) pIDLData->u.file.uFileAttribs |= FILE_ATTRIBUTE_DIRECTORY; + pIDLData->u.file.uFileAttribs |= findData.dwFileAttributes; if (pszComponentU[0] == '.') pIDLData->u.file.uFileAttribs |= FILE_ATTRIBUTE_HIDDEN; cComponentALen = lstrlenA(pszComponentA) + 1; memcpy(pIDLData->u.file.szNames, pszComponentA, cComponentALen); @@ -565,9 +550,9 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, LPBC pbc, void *pIDL) { pFileStructW = (FileStructW*)(pIDLData->u.file.szNames + cComponentALen + (cComponentALen & 0x1)); uOffsetW = (WORD)(((LPBYTE)pFileStructW) - ((LPBYTE)pIDL)); pFileStructW->cbLen = cbLen - uOffsetW; - UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_mtime, &pFileStructW->uCreationDate, + FileTimeToDosDateTime(&findData.ftLastWriteTime, &pFileStructW->uCreationDate, &pFileStructW->uCreationTime); - UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_atime, &pFileStructW->uLastAccessDate, + FileTimeToDosDateTime(&findData.ftLastAccessTime, &pFileStructW->uLastAccessDate, &pFileStructW->uLastAccessTime); lstrcpyW(pFileStructW->wszName, pwszComponentW); @@ -601,6 +586,8 @@ static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, LPBC pbc, const WCHA int cPidlLen, cPathLen; char *pSlash, *pNextSlash, szCompletePath[FILENAME_MAX], *pNextPathElement, *pszAPath; WCHAR *pwszPath; + WIN32_FIND_DATAW find_data; + BOOL must_exist = TRUE; TRACE("pUnixFolder=%p, pbc=%p, path=%s, ppidl=%p\n", pUnixFolder, pbc, debugstr_w(path), ppidl); @@ -691,11 +678,32 @@ static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, LPBC pbc, const WCHA *ppidl = pidl = SHAlloc(cPidlLen); if (!pidl) return E_FAIL; + if (pbc) { + IUnknown *unk; + IFileSystemBindData *fsb; + HRESULT hr; + + hr = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &unk); + if (SUCCEEDED(hr)) { + hr = IUnknown_QueryInterface(unk, &IID_IFileSystemBindData, (LPVOID*)&fsb); + if (SUCCEEDED(hr)) { + hr = IFileSystemBindData_GetFindData(fsb, &find_data); + if (FAILED(hr)) + memset(&find_data, 0, sizeof(WIN32_FIND_DATAW)); + + must_exist = FALSE; + IFileSystemBindData_Release(fsb); + } + IUnknown_Release(unk); + } + } + /* Concatenate the SHITEMIDs of the sub-directories. */ while (*pNextPathElement) { pSlash = strchr(pNextPathElement+1, '/'); if (pSlash) *pSlash = '\0'; - pNextPathElement = UNIXFS_build_shitemid(szCompletePath, pbc, pidl); + pNextPathElement = UNIXFS_build_shitemid(szCompletePath, must_exist, + must_exist&&!pSlash ? &find_data : NULL, pidl); if (pSlash) *pSlash = '/'; if (!pNextPathElement) { @@ -2426,7 +2434,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface, lstrcpyA(pszRelativePath, pDirEntry->d_name); rgelt[i] = SHAlloc( UNIXFS_shitemid_len_from_filename(pszRelativePath, NULL, NULL)+sizeof(USHORT)); - if (!UNIXFS_build_shitemid(This->m_szFolder, NULL, rgelt[i]) || + if (!UNIXFS_build_shitemid(This->m_szFolder, TRUE, NULL, rgelt[i]) || !UNIXFS_is_pidl_of_type(rgelt[i], This->m_fFilter)) { SHFree(rgelt[i]);

1 0

Alexandre Julliard : shell32: Convert menu and string table resources to po files.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: db60006e26b8f9ed5eaf38342157e98a2615b238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db60006e26b8f9ed5eaf38342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 17:00:16 2011 +0100 shell32: Convert menu and string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/shell32/Makefile.in | 7 +- dlls/shell32/shell32.rc | 375 ++++++++++++++++++++++++++ dlls/shell32/shell32_Bg.rc | 185 ------------- dlls/shell32/shell32_Ca.rc | 51 ---- dlls/shell32/shell32_Cs.rc | 151 ----------- dlls/shell32/shell32_Da.rc | 215 --------------- dlls/shell32/shell32_De.rc | 237 ---------------- dlls/shell32/shell32_En.rc | 236 ---------------- dlls/shell32/shell32_Eo.rc | 199 -------------- dlls/shell32/shell32_Es.rc | 215 --------------- dlls/shell32/shell32_Fi.rc | 235 ---------------- dlls/shell32/shell32_Fr.rc | 237 ---------------- dlls/shell32/shell32_He.rc | 233 ---------------- dlls/shell32/shell32_Hu.rc | 218 --------------- dlls/shell32/shell32_It.rc | 236 ---------------- dlls/shell32/shell32_Ja.rc | 236 ---------------- dlls/shell32/shell32_Ko.rc | 234 ---------------- dlls/shell32/shell32_Lt.rc | 238 ---------------- dlls/shell32/shell32_Nl.rc | 238 ---------------- dlls/shell32/shell32_No.rc | 215 --------------- dlls/shell32/shell32_Pl.rc | 237 ---------------- dlls/shell32/shell32_Pt.rc | 483 --------------------------------- dlls/shell32/shell32_Ro.rc | 214 --------------- dlls/shell32/shell32_Ru.rc | 197 -------------- dlls/shell32/shell32_Si.rc | 234 ---------------- dlls/shell32/shell32_Sk.rc | 61 ----- dlls/shell32/shell32_Sr.rc | 470 -------------------------------- dlls/shell32/shell32_Sv.rc | 236 ---------------- dlls/shell32/shell32_Tr.rc | 185 ------------- dlls/shell32/shell32_Uk.rc | 236 ---------------- dlls/shell32/shell32_Wa.rc | 50 ---- dlls/shell32/shell32_Zh.rc | 316 ---------------------- dlls/shell32/shres.rc | 130 --------- dlls/shell32/version.rc | 26 -- po/ar.po | 558 ++++++++++++++++++++++++++++++++++---- po/bg.po | 592 ++++++++++++++++++++++++++++++++++++----- po/cs.po | 627 ++++++++++++++++++++++++++++++++++++++----- po/da.po | 627 +++++++++++++++++++++++++++++++++++++++----- po/de.po | 605 +++++++++++++++++++++++++++++++++++++---- po/el.po | 554 ++++++++++++++++++++++++++++++++++---- po/en.po | 593 +++++++++++++++++++++++++++++++++++++---- po/en_US.po | 569 +++++++++++++++++++++++++++++++++++---- po/eo.po | 609 +++++++++++++++++++++++++++++++++++++----- po/es.po | 620 ++++++++++++++++++++++++++++++++++++++----- po/fa.po | 558 ++++++++++++++++++++++++++++++++++---- po/fi.po | 614 +++++++++++++++++++++++++++++++++++++----- po/fr.po | 599 +++++++++++++++++++++++++++++++++++++---- po/he.po | 586 ++++++++++++++++++++++++++++++++++++---- po/hi.po | 549 ++++++++++++++++++++++++++++++++++---- po/hu.po | 638 ++++++++++++++++++++++++++++++++++++++------ po/it.po | 602 +++++++++++++++++++++++++++++++++++++----- po/ja.po | 594 +++++++++++++++++++++++++++++++++++++---- po/ko.po | 600 +++++++++++++++++++++++++++++++++++++----- po/lt.po | 599 +++++++++++++++++++++++++++++++++++++---- po/ml.po | 549 ++++++++++++++++++++++++++++++++++---- po/nb_NO.po | 597 +++++++++++++++++++++++++++++++++++++---- po/nl.po | 595 +++++++++++++++++++++++++++++++++++++---- po/or.po | 549 ++++++++++++++++++++++++++++++++++---- po/pa.po | 549 ++++++++++++++++++++++++++++++++++---- po/pl.po | 611 ++++++++++++++++++++++++++++++++++++++----- po/pt_BR.po | 605 +++++++++++++++++++++++++++++++++++++----- po/pt_PT.po | 603 +++++++++++++++++++++++++++++++++++++----- po/rm.po | 557 ++++++++++++++++++++++++++++++++++---- po/ro.po | 629 +++++++++++++++++++++++++++++++++++++++---- po/ru.po | 637 +++++++++++++++++++++++++++++++++++++++----- po/sk.po | 592 ++++++++++++++++++++++++++++++++++++----- po/sl.po | 615 ++++++++++++++++++++++++++++++++++++++----- po/sr_RS(a)cyrillic.po | 602 +++++++++++++++++++++++++++++++++++++----- po/sr_RS(a)latin.po | 610 +++++++++++++++++++++++++++++++++++++----- po/sv.po | 598 +++++++++++++++++++++++++++++++++++++---- po/te.po | 549 ++++++++++++++++++++++++++++++++++---- po/th.po | 558 ++++++++++++++++++++++++++++++++++---- po/tr.po | 620 ++++++++++++++++++++++++++++++++++++++----- po/uk.po | 608 +++++++++++++++++++++++++++++++++++++----- po/wa.po | 578 +++++++++++++++++++++++++++++++++++---- po/wine.pot | 546 ++++++++++++++++++++++++++++++++++---- po/zh_CN.po | 599 +++++++++++++++++++++++++++++++++++++---- po/zh_TW.po | 628 +++++++++++++++++++++++++++++++++++++++---- 80 files changed, 23823 insertions(+), 9524 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db60006e26b8f9ed5eaf3…

1 0

Alexandre Julliard : user32: Convert menu and string table resources to po files.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 39558f8d811fcf229a47e22f146bc33de6015c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39558f8d811fcf229a47e22f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 17:24:15 2011 +0100 user32: Convert menu and string table resources to po files. --- configure | 3 +- configure.ac | 3 +- dlls/user32/Makefile.in | 5 +- dlls/user32/resources/user32_Bg.rc | 35 - dlls/user32/resources/user32_Ca.rc | 28 - dlls/user32/resources/user32_Cs.rc | 28 - dlls/user32/resources/user32_Da.rc | 35 - dlls/user32/resources/user32_De.rc | 35 - dlls/user32/resources/user32_En.rc | 35 - dlls/user32/resources/user32_Eo.rc | 35 - dlls/user32/resources/user32_Es.rc | 35 - dlls/user32/resources/user32_Fi.rc | 35 - dlls/user32/resources/user32_Fr.rc | 35 - dlls/user32/resources/user32_He.rc | 35 - dlls/user32/resources/user32_Hu.rc | 34 - dlls/user32/resources/user32_It.rc | 35 - dlls/user32/resources/user32_Ja.rc | 35 - dlls/user32/resources/user32_Ko.rc | 34 - dlls/user32/resources/user32_Lt.rc | 35 - dlls/user32/resources/user32_Nl.rc | 34 - dlls/user32/resources/user32_No.rc | 35 - dlls/user32/resources/user32_Pl.rc | 34 - dlls/user32/resources/user32_Pt.rc | 75 - dlls/user32/resources/user32_Ro.rc | 35 - dlls/user32/resources/user32_Ru.rc | 35 - dlls/user32/resources/user32_Si.rc | 35 - dlls/user32/resources/user32_Sk.rc | 35 - dlls/user32/resources/user32_Sr.rc | 68 - dlls/user32/resources/user32_Sv.rc | 35 - dlls/user32/resources/user32_Tr.rc | 35 - dlls/user32/resources/user32_Uk.rc | 35 - dlls/user32/resources/user32_Wa.rc | 28 - dlls/user32/resources/user32_Zh.rc | 68 - dlls/user32/resources/version.rc | 32 - dlls/user32/{resources/user32_bin.rc => user32.rc} | 55 +- po/LINGUAS | 1 + po/ar.po | 62 +- po/bg.po | 67 +- po/ca.po | 6762 ++++++++++++++++++++ po/cs.po | 61 +- po/da.po | 79 +- po/de.po | 81 +- po/el.po | 60 +- po/en.po | 65 +- po/en_US.po | 60 +- po/eo.po | 87 +- po/es.po | 74 +- po/fa.po | 62 +- po/fi.po | 67 +- po/fr.po | 77 +- po/he.po | 74 +- po/hi.po | 61 +- po/hu.po | 75 +- po/it.po | 74 +- po/ja.po | 77 +- po/ko.po | 91 +- po/lt.po | 84 +- po/ml.po | 61 +- po/nb_NO.po | 74 +- po/nl.po | 70 +- po/or.po | 61 +- po/pa.po | 61 +- po/pl.po | 72 +- po/pt_BR.po | 100 +- po/pt_PT.po | 100 +- po/rm.po | 61 +- po/ro.po | 86 +- po/ru.po | 79 +- po/sk.po | 82 +- po/sl.po | 65 +- po/sr_RS(a)cyrillic.po | 73 +- po/sr_RS(a)latin.po | 73 +- po/sv.po | 74 +- po/te.po | 61 +- po/th.po | 61 +- po/tr.po | 60 +- po/uk.po | 112 +- po/wa.po | 83 +- po/wine.pot | 60 +- po/zh_CN.po | 68 +- po/zh_TW.po | 85 +- 81 files changed, 9090 insertions(+), 2122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39558f8d811fcf229a47e…

1 0

Kusanagi Kouichi : gdi32/tests: Add a test for GetCharABCWidthsA with DBCS.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: fcb4a1610e97cde8ec8c266f2c7817768a4ba3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb4a1610e97cde8ec8c266f2… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 13 19:17:45 2011 +0900 gdi32/tests: Add a test for GetCharABCWidthsA with DBCS. --- dlls/gdi32/tests/font.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4230ebc..9b9a5b4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -38,6 +38,7 @@ static LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); +static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -55,6 +56,7 @@ static void init(void) pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); + pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); @@ -873,6 +875,25 @@ static void test_GdiGetCharDimensions(void) DeleteDC(hdc); } +static int CALLBACK create_font_proc(const LOGFONT *lpelfe, + const TEXTMETRIC *lpntme, + DWORD FontType, LPARAM lParam) +{ + if (FontType & TRUETYPE_FONTTYPE) + { + HFONT hfont; + + hfont = CreateFontIndirect(lpelfe); + if (hfont) + { + *(HFONT *)lParam = hfont; + return 0; + } + } + + return 1; +} + static void test_GetCharABCWidths(void) { static const WCHAR str[] = {'a',0}; @@ -883,10 +904,24 @@ static void test_GetCharABCWidths(void) ABC abc[1]; WORD glyphs[1]; DWORD nb; + static const struct + { + UINT cs; + UINT a; + UINT w; + } c[] = + { + {SHIFTJIS_CHARSET, 0x82a0, 0x3042}, + {HANGEUL_CHARSET, 0x8141, 0xac02}, + {JOHAB_CHARSET, 0x8446, 0x3135}, + {GB2312_CHARSET, 0x8141, 0x4e04}, + {CHINESEBIG5_CHARSET, 0xa142, 0x3001} + }; + UINT i; - if (!pGetCharABCWidthsW || !pGetCharABCWidthsI) + if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsI) { - win_skip("GetCharABCWidthsW/I not available on this platform\n"); + win_skip("GetCharABCWidthsA/W/I not available on this platform\n"); return; } @@ -921,6 +956,32 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + for (i = 0; i < sizeof c / sizeof c[0]; ++i) + { + ABC a[2], w[2]; + + lf.lfFaceName[0] = '\0'; + lf.lfCharSet = c[i].cs; + lf.lfPitchAndFamily = 0; + if (EnumFontFamiliesEx(hdc, &lf, create_font_proc, (LPARAM)&hfont, 0)) + { + skip("TrueType font for charset %u is not installed\n", c[i].cs); + continue; + } + + memset(a, 0, sizeof a); + memset(w, 0, sizeof w); + hfont = SelectObject(hdc, hfont); + todo_wine + ok(pGetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && + pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && + memcmp(a, w, sizeof a) == 0, + "GetCharABCWidthsA and GetCharABCWidthsW should return same widths. charset = %u\n", c[i].cs); + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + } + ReleaseDC(NULL, hdc); }

1 0

Kusanagi Kouichi : gdi32: GetCharABCWidthsA should work for DBCS.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 5c987fc57403a4ed26cd35b33318069913a66ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c987fc57403a4ed26cd35b33… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 13 19:18:16 2011 +0900 gdi32: GetCharABCWidthsA should work for DBCS. --- dlls/gdi32/font.c | 27 +++++++++++++++++++++------ dlls/gdi32/tests/font.c | 1 - 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fe68893..5d47ca6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2296,18 +2296,33 @@ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, LPABC abc ) { - INT i, wlen, count = (INT)(lastChar - firstChar + 1); + INT i, wlen; + UINT c; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; - if(count <= 0) return FALSE; + if (lastChar < firstChar) + return FALSE; - str = HeapAlloc(GetProcessHeap(), 0, count); - for(i = 0; i < count; i++) - str[i] = (BYTE)(firstChar + i); + str = HeapAlloc(GetProcessHeap(), 0, (lastChar - firstChar + 1) * 2 + 1); + if (str == NULL) + return FALSE; - wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); + for(i = 0, c = firstChar; c <= lastChar; i++, c++) + { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + str[i] = (BYTE)c; + } + str[i] = '\0'; + + wstr = FONT_mbtowc(hdc, str, -1, &wlen, NULL); + if (wstr == NULL) + { + HeapFree(GetProcessHeap(), 0, str); + return FALSE; + } for(i = 0; i < wlen; i++) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9b9a5b4..a8c28f4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -973,7 +973,6 @@ static void test_GetCharABCWidths(void) memset(a, 0, sizeof a); memset(w, 0, sizeof w); hfont = SelectObject(hdc, hfont); - todo_wine ok(pGetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && memcmp(a, w, sizeof a) == 0,

1 0