wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Alexandre Julliard : comctl32: Convert string table resources to po files.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 54684cf67439f2aad07093c33d3615b282519c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54684cf67439f2aad07093c33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 11 13:43:35 2011 +0100 comctl32: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/comctl32/Makefile.in | 6 +++- dlls/comctl32/{rsrc.rc => comctl32.rc} | 23 +++++++++++++++++ dlls/comctl32/comctl_Bg.rc | 21 ---------------- dlls/comctl32/comctl_Cs.rc | 21 ---------------- dlls/comctl32/comctl_Da.rc | 21 ---------------- dlls/comctl32/comctl_De.rc | 21 ---------------- dlls/comctl32/comctl_El.rc | 21 ---------------- dlls/comctl32/comctl_En.rc | 21 ---------------- dlls/comctl32/comctl_Eo.rc | 21 ---------------- dlls/comctl32/comctl_Es.rc | 21 ---------------- dlls/comctl32/comctl_Fr.rc | 21 ---------------- dlls/comctl32/comctl_He.rc | 21 ---------------- dlls/comctl32/comctl_Hu.rc | 21 ---------------- dlls/comctl32/comctl_It.rc | 21 ---------------- dlls/comctl32/comctl_Ja.rc | 21 ---------------- dlls/comctl32/comctl_Ko.rc | 21 ---------------- dlls/comctl32/comctl_Lt.rc | 21 ---------------- dlls/comctl32/comctl_Nl.rc | 21 ---------------- dlls/comctl32/comctl_No.rc | 21 ---------------- dlls/comctl32/comctl_Pl.rc | 21 ---------------- dlls/comctl32/comctl_Pt.rc | 21 ---------------- dlls/comctl32/comctl_Ro.rc | 21 ---------------- dlls/comctl32/comctl_Ru.rc | 21 ---------------- dlls/comctl32/comctl_Si.rc | 21 ---------------- dlls/comctl32/comctl_Sk.rc | 21 ---------------- dlls/comctl32/comctl_Sr.rc | 42 -------------------------------- dlls/comctl32/comctl_Sv.rc | 21 ---------------- dlls/comctl32/comctl_Th.rc | 21 ---------------- dlls/comctl32/comctl_Tr.rc | 21 ---------------- dlls/comctl32/comctl_Uk.rc | 21 ---------------- dlls/comctl32/comctl_Zh.rc | 42 -------------------------------- po/ar.po | 28 +++++++++++++++------ po/bg.po | 28 +++++++++++++++------ po/cs.po | 33 +++++++++++++++++++------ po/da.po | 28 +++++++++++++++------ po/de.po | 38 ++++++++++++++++++++++------ po/el.po | 28 +++++++++++++++------ po/en.po | 28 +++++++++++++++------ po/en_US.po | 28 +++++++++++++++------ po/eo.po | 28 +++++++++++++++------ po/es.po | 33 +++++++++++++++++++------ po/fa.po | 28 +++++++++++++++------ po/fi.po | 28 +++++++++++++++------ po/fr.po | 38 +++++++++++++++++++---------- po/he.po | 33 +++++++++++++++++++------ po/hi.po | 28 +++++++++++++++------ po/hu.po | 38 +++++++++++++++++++---------- po/it.po | 28 +++++++++++++++------ po/ja.po | 33 +++++++++++++++++++------ po/ko.po | 28 +++++++++++++++------ po/lt.po | 33 +++++++++++++++++++------ po/ml.po | 28 +++++++++++++++------ po/nb_NO.po | 28 +++++++++++++++------ po/nl.po | 28 +++++++++++++++------ po/or.po | 28 +++++++++++++++------ po/pa.po | 28 +++++++++++++++------ po/pl.po | 28 +++++++++++++++------ po/pt_BR.po | 38 +++++++++++++++++++---------- po/pt_PT.po | 38 +++++++++++++++++++---------- po/rm.po | 28 +++++++++++++++------ po/ro.po | 38 +++++++++++++++++++---------- po/ru.po | 28 +++++++++++++++------ po/sk.po | 28 +++++++++++++++------ po/sl.po | 28 +++++++++++++++------ po/sr_RS(a)cyrillic.po | 28 +++++++++++++++------ po/sr_RS(a)latin.po | 28 +++++++++++++++------ po/sv.po | 28 +++++++++++++++------ po/te.po | 28 +++++++++++++++------ po/th.po | 28 +++++++++++++++------ po/tr.po | 29 +++++++++++++++------- po/uk.po | 34 +++++++++++++++++++------- po/wa.po | 28 +++++++++++++++------ po/wine.pot | 28 +++++++++++++++------ po/zh_CN.po | 33 +++++++++++++++++++------ po/zh_TW.po | 33 +++++++++++++++++++------ 77 files changed, 984 insertions(+), 1034 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54684cf67439f2aad0709…

1 0

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

11 Jan '11

Module: wine Branch: master Commit: 4447900540c003bdb71fff1f27fb9bcf712d9ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4447900540c003bdb71fff1f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 11 12:56:17 2011 +0100 browseui: Convert menu and string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/browseui/Makefile.in | 6 ++++-- dlls/browseui/{version.rc => browseui.rc} | 11 ++++++++++- dlls/browseui/rsrc_Da.rc | 5 ----- dlls/browseui/rsrc_De.rc | 5 ----- dlls/browseui/rsrc_En.rc | 5 ----- dlls/browseui/rsrc_Es.rc | 5 ----- dlls/browseui/rsrc_Fr.rc | 5 ----- dlls/browseui/rsrc_He.rc | 5 ----- dlls/browseui/rsrc_Hu.rc | 5 ----- dlls/browseui/rsrc_It.rc | 5 ----- dlls/browseui/rsrc_Ja.rc | 5 ----- dlls/browseui/rsrc_Ko.rc | 5 ----- dlls/browseui/rsrc_Lt.rc | 5 ----- dlls/browseui/rsrc_Nl.rc | 5 ----- dlls/browseui/rsrc_No.rc | 5 ----- dlls/browseui/rsrc_Pl.rc | 5 ----- dlls/browseui/rsrc_Pt.rc | 15 --------------- dlls/browseui/rsrc_Ro.rc | 5 ----- dlls/browseui/rsrc_Ru.rc | 5 ----- dlls/browseui/rsrc_Si.rc | 5 ----- dlls/browseui/rsrc_Sr.rc | 10 ---------- dlls/browseui/rsrc_Sv.rc | 5 ----- dlls/browseui/rsrc_Uk.rc | 5 ----- dlls/browseui/rsrc_Zh.rc | 10 ---------- po/ar.po | 4 ++++ po/bg.po | 4 ++++ po/cs.po | 4 ++++ po/da.po | 4 ++++ po/de.po | 4 ++++ po/el.po | 4 ++++ po/en.po | 4 ++++ po/en_US.po | 4 ++++ po/eo.po | 4 ++++ po/es.po | 4 ++++ po/fa.po | 4 ++++ po/fi.po | 4 ++++ po/fr.po | 4 ++++ po/he.po | 4 ++++ po/hi.po | 4 ++++ po/hu.po | 4 ++++ po/it.po | 4 ++++ po/ja.po | 4 ++++ po/ko.po | 4 ++++ po/lt.po | 4 ++++ po/ml.po | 4 ++++ po/nb_NO.po | 4 ++++ po/nl.po | 4 ++++ po/or.po | 4 ++++ po/pa.po | 4 ++++ po/pl.po | 4 ++++ po/pt_BR.po | 4 ++++ po/pt_PT.po | 4 ++++ po/rm.po | 4 ++++ po/ro.po | 4 ++++ po/ru.po | 4 ++++ po/sk.po | 4 ++++ po/sl.po | 4 ++++ po/sr_RS(a)cyrillic.po | 4 ++++ po/sr_RS(a)latin.po | 4 ++++ po/sv.po | 4 ++++ po/te.po | 4 ++++ po/th.po | 4 ++++ po/tr.po | 4 ++++ po/uk.po | 4 ++++ po/wa.po | 4 ++++ po/wine.pot | 4 ++++ po/zh_CN.po | 4 ++++ po/zh_TW.po | 4 ++++ 70 files changed, 192 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4447900540c003bdb71ff…

1 0

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

11 Jan '11

Module: wine Branch: master Commit: 88daff74dc3236591f11ead2de1c19b5707ccc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88daff74dc3236591f11ead2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 11 12:41:31 2011 +0100 wordpad: Convert menu and string table resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 404 ++++++++++++++++++++++++++++++++++-- po/bg.po | 409 ++++++++++++++++++++++++++++++++++-- po/cs.po | 416 +++++++++++++++++++++++++++++++++++-- po/da.po | 452 ++++++++++++++++++++++++++++++++++++---- po/de.po | 432 +++++++++++++++++++++++++++++++++++--- po/el.po | 392 ++++++++++++++++++++++++++++++++-- po/en.po | 409 ++++++++++++++++++++++++++++++++++-- po/en_US.po | 388 ++++++++++++++++++++++++++++++++-- po/eo.po | 406 ++++++++++++++++++++++++++++++++++-- po/es.po | 419 +++++++++++++++++++++++++++++++++++-- po/fa.po | 404 ++++++++++++++++++++++++++++++++++-- po/fi.po | 415 ++++++++++++++++++++++++++++++++++-- po/fr.po | 431 +++++++++++++++++++++++++++++++++++--- po/he.po | 416 ++++++++++++++++++++++++++++++++++-- po/hi.po | 387 ++++++++++++++++++++++++++++++++-- po/hu.po | 476 ++++++++++++++++++++++++++++++++++++++--- po/it.po | 424 ++++++++++++++++++++++++++++++++++--- po/ja.po | 402 +++++++++++++++++++++++++++++++++-- po/ko.po | 402 +++++++++++++++++++++++++++++++++-- po/lt.po | 388 ++++++++++++++++++++++++++++++++-- po/ml.po | 387 ++++++++++++++++++++++++++++++++-- po/nb_NO.po | 402 +++++++++++++++++++++++++++++++++-- po/nl.po | 423 ++++++++++++++++++++++++++++++++++--- po/or.po | 387 ++++++++++++++++++++++++++++++++-- po/pa.po | 387 ++++++++++++++++++++++++++++++++-- po/pl.po | 423 ++++++++++++++++++++++++++++++++++--- po/pt_BR.po | 444 ++++++++++++++++++++++++++++++++++++--- po/pt_PT.po | 453 +++++++++++++++++++++++++++++++++++++--- po/rm.po | 395 +++++++++++++++++++++++++++++++++-- po/ro.po | 435 +++++++++++++++++++++++++++++++++++--- po/ru.po | 432 +++++++++++++++++++++++++++++++++++--- po/sk.po | 395 +++++++++++++++++++++++++++++++++-- po/sl.po | 416 ++++++++++++++++++++++++++++++++++-- po/sr_RS(a)cyrillic.po | 410 ++++++++++++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 415 ++++++++++++++++++++++++++++++++++-- po/sv.po | 435 ++++++++++++++++++++++++++++++++++---- po/te.po | 387 ++++++++++++++++++++++++++++++++-- po/th.po | 401 +++++++++++++++++++++++++++++++++-- po/tr.po | 478 +++++++++++++++++++++++++++++++++++++++--- po/uk.po | 425 +++++++++++++++++++++++++++++++++++-- po/wa.po | 404 ++++++++++++++++++++++++++++++++++-- po/wine.pot | 386 ++++++++++++++++++++++++++++++++-- po/zh_CN.po | 428 ++++++++++++++++++++++++++++++++++--- po/zh_TW.po | 425 ++++++++++++++++++++++++++++++++++--- programs/wordpad/Da.rc | 181 ---------------- programs/wordpad/De.rc | 181 ---------------- programs/wordpad/En.rc | 200 ++---------------- programs/wordpad/Fr.rc | 181 ---------------- programs/wordpad/He.rc | 173 --------------- programs/wordpad/Hu.rc | 107 ---------- programs/wordpad/It.rc | 173 --------------- programs/wordpad/Ja.rc | 173 --------------- programs/wordpad/Ko.rc | 174 --------------- programs/wordpad/Lt.rc | 181 ---------------- programs/wordpad/Makefile.in | 6 +- programs/wordpad/Nl.rc | 173 --------------- programs/wordpad/No.rc | 181 ---------------- programs/wordpad/Pl.rc | 181 ---------------- programs/wordpad/Pt.rc | 313 --------------------------- programs/wordpad/Ro.rc | 171 --------------- programs/wordpad/Ru.rc | 181 ---------------- programs/wordpad/Si.rc | 182 ---------------- programs/wordpad/Sv.rc | 185 ---------------- programs/wordpad/Tr.rc | 133 ------------ programs/wordpad/Uk.rc | 182 ---------------- programs/wordpad/Zh.rc | 329 ----------------------------- programs/wordpad/rsrc.rc | 56 ----- programs/wordpad/wordpad.rc | 209 ++++++++++++++++++ 70 files changed, 17424 insertions(+), 5031 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88daff74dc3236591f11e…

1 0

Andrew Bogott : winemenubuilder: Avoid passing a null pointer ( or a non-pointer) to extract_icon in InvokeShellLinkerForURL.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: a901983fe334ea7ba2aba922c3cab403a140d86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a901983fe334ea7ba2aba922c… Author: Andrew Bogott <Andrew(a)CodeWeavers.com> Date: Sun Jan 9 11:02:54 2011 -0500 winemenubuilder: Avoid passing a null pointer (or a non-pointer) to extract_icon in InvokeShellLinkerForURL. --- programs/winemenubuilder/winemenubuilder.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index dfb2441..8996836 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2752,9 +2752,12 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv); if (SUCCEEDED(hr)) { - icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait ); + if (pv[0].vt == VT_LPWSTR && pv[0].u.pwszVal) + { + icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait ); - WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name); + WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name); + } PropVariantClear(&pv[0]); PropVariantClear(&pv[1]); }

1 0

David Hedberg : urlmon: Add some error handling to the http protocol.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 5205d03800933bd11126512d8c02b39afbffd3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5205d03800933bd11126512d8… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Jan 9 06:28:54 2011 +0100 urlmon: Add some error handling to the http protocol. --- dlls/urlmon/http.c | 173 +++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/url.c | 214 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 370 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5205d03800933bd111265…

1 0

Hans Leidekker : fusion/tests: Add some tests for IAssemblyCache_QueryAssemblyInfo.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: c9e6f77419c76dafee83022af319dce038331892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e6f77419c76dafee83022af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 11 10:29:19 2011 +0100 fusion/tests: Add some tests for IAssemblyCache_QueryAssemblyInfo. --- dlls/fusion/tests/asmcache.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 8f438cf..8af1553 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1318,11 +1318,18 @@ static void test_QueryAssemblyInfo(void) ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); - /* display name is "wine, Version=1.0.0.00000" */ - INIT_ASM_INFO(); + /* short buffer */ + memset(&info, 0, sizeof(info)); lstrcpyW(name, wine); lstrcatW(name, commasep); lstrcatW(name, otherver); + hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, + name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); + + /* display name is "wine, Version=1.0.0.00000" */ + INIT_ASM_INFO(); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Hans Leidekker : msi: Improve detection of installed local assemblies.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 52f719d18c51f23b1432721cd939092f9c80ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f719d18c51f23b1432721cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 11 10:29:06 2011 +0100 msi: Improve detection of installed local assemblies. --- dlls/msi/assembly.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 1189f68..04d42b4 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -268,7 +268,8 @@ static BOOL check_assembly_installed( MSIPACKAGE *package, MSIASSEMBLY *assembly if (assembly->application) { - /* FIXME: we should probably check the manifest file here */ + FIXME("we should probably check the manifest file here\n"); + if (msi_get_property_int( package->db, szInstalled, 0 )) return TRUE; return FALSE; }

1 0

Hans Leidekker : msi: Don' t extract files for assemblies which are already installed.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 6a0801a40ac45b260d75cff0d77add6373d94ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0801a40ac45b260d75cff0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 11 10:28:50 2011 +0100 msi: Don't extract files for assemblies which are already installed. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 182e027..9d0e01a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -68,7 +68,8 @@ static void schedule_install_files(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled) + if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || + (comp->assembly && comp->assembly->installed)) { TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); file->state = msifs_skipped;

1 0

Hans Leidekker : msi: Fix detection of installed global assemblies.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 65581e0e3357e7d12fe9e41843edcb27ab33671f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65581e0e3357e7d12fe9e4184… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 11 10:28:35 2011 +0100 msi: Fix detection of installed global assemblies. --- dlls/msi/assembly.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 49431aa..1189f68 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -283,7 +283,7 @@ static BOOL check_assembly_installed( MSIPACKAGE *package, MSIASSEMBLY *assembly memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, QUERYASMINFO_FLAG_VALIDATE, assembly->display_name, &info ); - if (hr != S_OK) + if (hr != HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) return FALSE; return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED);

1 0

Hans Leidekker : msi: Add support for comparing TrueType font versions.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 0c25649d3ea2c88a6d4716119c43eb4a050d2c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c25649d3ea2c88a6d4716119… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 11 10:28:16 2011 +0100 msi: Add support for comparing TrueType font versions. --- dlls/msi/action.c | 63 ++++++++++++++++++++++++++++++++++++++------------ dlls/msi/appsearch.c | 2 +- dlls/msi/font.c | 55 +++++++++++++++++++++++++++++++------------ dlls/msi/msipriv.h | 1 + 4 files changed, 89 insertions(+), 32 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c5661c0..7ccc7c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2236,6 +2236,18 @@ int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) return 0; } +static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) +{ + DWORD ms1, ms2; + + msi_parse_version_string( ver1, &ms1, NULL ); + msi_parse_version_string( ver2, &ms2, NULL ); + + if (ms1 > ms2) return 1; + else if (ms1 < ms2) return -1; + return 0; +} + static DWORD get_disk_file_size( LPCWSTR filename ) { HANDLE file; @@ -2305,6 +2317,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) static UINT set_file_install_states( MSIPACKAGE *package ) { VS_FIXEDFILEINFO *file_version; + WCHAR *font_version; MSIFILE *file; LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -2326,26 +2339,46 @@ static UINT set_file_install_states( MSIPACKAGE *package ) comp->Cost += file->FileSize; continue; } - if (file->Version && (file_version = msi_get_disk_file_version( file->TargetPath ))) + if (file->Version) { - TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), - LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), - LOWORD(file_version->dwFileVersionLS)); - - if (msi_compare_file_versions( file_version, file->Version ) < 0) + if ((file_version = msi_get_disk_file_version( file->TargetPath ))) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); + + if (msi_compare_file_versions( file_version, file->Version ) < 0) + { + file->state = msifs_overwrite; + comp->Cost += file->FileSize; + } + else + { + TRACE("Destination file version equal or greater, not overwriting\n"); + file->state = msifs_present; + } + msi_free( file_version ); + continue; } - else + else if ((font_version = font_version_from_file( file->TargetPath ))) { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); + + if (msi_compare_font_versions( font_version, file->Version ) < 0) + { + file->state = msifs_overwrite; + comp->Cost += file->FileSize; + } + else + { + TRACE("Destination file version equal or greater, not overwriting\n"); + file->state = msifs_present; + } + msi_free( font_version ); + continue; } - msi_free( file_version ); - continue; } if ((file_size = get_disk_file_size( file->TargetPath )) != file->FileSize) { diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 28aac23..c8aea77 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -71,7 +71,7 @@ void msi_parse_version_string(LPCWSTR verStr, PDWORD ms, PDWORD ls) x4 = atoiW(ptr + 1); /* FIXME: byte-order dependent? */ *ms = x1 << 16 | x2; - *ls = x3 << 16 | x4; + if (ls) *ls = x3 << 16 | x4; } /* Fills in sig with the values from the Signature table, where name is the diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 2128e92..7a49386 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -52,6 +52,9 @@ typedef struct _tagTT_NAME_TABLE_HEADER { * from start of the table */ } TT_NAME_TABLE_HEADER; +#define NAME_ID_FULL_FONT_NAME 4 +#define NAME_ID_VERSION 5 + typedef struct _tagTT_NAME_RECORD { USHORT uPlatformID; USHORT uEncodingID; @@ -80,10 +83,8 @@ static const WCHAR regfont2[] = /* * Code based off of code located here * http://www.codeproject.com/gdi/fontnamefromfile.asp - * - * Using string index 4 (full font name) instead of 1 (family name) */ -static LPWSTR load_ttfname_from(LPCWSTR filename) +WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) { TT_TABLE_DIRECTORY tblDir; BOOL bFound = FALSE; @@ -142,30 +143,24 @@ static LPWSTR load_ttfname_from(LPCWSTR filename) break; ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); - /* 4 is the Full Font Name */ - if(ttRecord.uNameID == 4) + if (ttRecord.uNameID == id) { int nPos; LPSTR buf; - static const char tt[] = " (TrueType)"; ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength); ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset); nPos = SetFilePointer(handle, 0, NULL, FILE_CURRENT); - SetFilePointer(handle, tblDir.uOffset + - ttRecord.uStringOffset + - ttNTHeader.uStorageOffset, - NULL, FILE_BEGIN); - buf = msi_alloc_zero( ttRecord.uStringLength + 1 + strlen(tt) ); + SetFilePointer(handle, tblDir.uOffset + ttRecord.uStringOffset + ttNTHeader.uStorageOffset, + NULL, FILE_BEGIN); + buf = msi_alloc_zero( ttRecord.uStringLength + 1 ); ReadFile(handle, buf, ttRecord.uStringLength, &dwRead, NULL); if (strlen(buf) > 0) { - strcat(buf,tt); ret = strdupAtoW(buf); msi_free(buf); break; } - msi_free(buf); SetFilePointer(handle,nPos, NULL, FILE_BEGIN); } @@ -173,8 +168,36 @@ static LPWSTR load_ttfname_from(LPCWSTR filename) end: CloseHandle(handle); + TRACE("Returning %s\n", debugstr_w(ret)); + return ret; +} + +static WCHAR *font_name_from_file( const WCHAR *filename ) +{ + static const WCHAR truetypeW[] = {' ','(','T','r','u','e','T','y','p','e',')',0}; + WCHAR *name, *ret = NULL; + + if ((name = load_ttf_name_id( filename, NAME_ID_FULL_FONT_NAME ))) + { + ret = msi_alloc( (strlenW( name ) + strlenW( truetypeW ) + 1 ) * sizeof(WCHAR) ); + strcpyW( ret, name ); + strcatW( ret, truetypeW ); + msi_free( name ); + } + return ret; +} - TRACE("Returning fontname %s\n",debugstr_w(ret)); +WCHAR *font_version_from_file( const WCHAR *filename ) +{ + WCHAR *version, *p, *ret = NULL; + + if ((p = version = load_ttf_name_id( filename, NAME_ID_VERSION ))) + { + while (*p && !isdigitW( *p )) p++; + ret = msi_alloc( (strlenW( p ) + 1) * sizeof(WCHAR) ); + strcpyW( ret, p ); + msi_free( version ); + } return ret; } @@ -212,7 +235,7 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) RegCreateKeyW(HKEY_LOCAL_MACHINE,regfont2,&hkey2); if (MSI_RecordIsNull(row,2)) - name = load_ttfname_from( file->TargetPath ); + name = font_name_from_file( file->TargetPath ); else name = msi_dup_record_field(row,2); @@ -296,7 +319,7 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param ) RegCreateKeyW( HKEY_LOCAL_MACHINE, regfont2, &hkey2 ); if (MSI_RecordIsNull( row, 2 )) - name = load_ttfname_from( file->TargetPath ); + name = font_name_from_file( file->TargetPath ); else name = msi_dup_record_field( row, 2 ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10ddb4e..3f482ea 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -957,6 +957,7 @@ extern void msi_component_set_state(MSIPACKAGE *, MSICOMPONENT *, INSTALLSTATE); extern void msi_feature_set_state(MSIPACKAGE *, MSIFEATURE *, INSTALLSTATE); extern MSIASSEMBLY *load_assembly(MSIPACKAGE *, MSICOMPONENT *); extern UINT install_assembly(MSIPACKAGE *, MSICOMPONENT *); +extern WCHAR *font_version_from_file(const WCHAR *); /* media */

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011