May 2010 - Wine-commits - list.winehq.org

Aric Stewart : usp10: ScriptTextOut reorders glyphs that are RTL if they have been processed with fLogicalOrder in previous calls .
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 2ba0048541d39e8cfef8d2b7c65f824bfd05ccaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba0048541d39e8cfef8d2b7c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 5 13:30:33 2010 -0500 usp10: ScriptTextOut reorders glyphs that are RTL if they have been processed with fLogicalOrder in previous calls. --- dlls/usp10/usp10.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b736966..3a7fcd1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1578,8 +1578,25 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) - hr = S_FALSE; + if (psa->fRTL && psa->fLogicalOrder) + { + int i; + WORD *rtlGlyphs; + + rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); + if (!rtlGlyphs) + return E_OUTOFMEMORY; + + for (i = 0; i < cGlyphs; i++) + rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i]; + + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, NULL)) + hr = S_FALSE; + heap_free(rtlGlyphs); + } + else + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) + hr = S_FALSE; return hr; }

1 0

Sven Baars : credui: Fix Dutch translation.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 079c01c508a29c8c4193322af4b14383cffb176a URL: http://source.winehq.org/git/wine.git/?a=commit;h=079c01c508a29c8c4193322af… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 18:55:05 2010 +0200 credui: Fix Dutch translation. --- dlls/credui/credui_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index 575496c..ac67a37 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -30,12 +30,12 @@ BEGIN CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Gebruikers naam:",-1,8,62,72,12,SS_CENTERIMAGE + LTEXT "&Gebruikersnaam:",-1,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&Wachtwoord:",-1,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Onthoudt mijn wachtwoord",IDC_SAVE,"Button", + CONTROL "&Onthoud mijn wachtwoord",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 DEFPUSHBUTTON "OK",IDOK,97,128,50,14 PUSHBUTTON "Annuleren",IDCANCEL,156,128,50,14 @@ -45,7 +45,7 @@ STRINGTABLE DISCARDABLE { IDS_TITLEFORMAT "Verbind met %s" IDS_MESSAGEFORMAT "Verbinden met %s" - IDS_INCORRECTPASSWORDTITLE "Aanloggen mislukt" + IDS_INCORRECTPASSWORDTITLE "Inloggen mislukt" IDS_INCORRECTPASSWORD "Controleer of uw gebruikersnaam\nen wachtwoord correct zijn." IDS_CAPSLOCKONTITLE "Caps Lock staat Aan" IDS_CAPSLOCKON "Met Caps Lock aan kan uw wachtwoord verkeerd worden ingevoerd.\n\nDruk op de Caps Lock toets op uw toetsenbord om Caps Lock uit\nte zetten voor invoer van uw wachtwoord."

1 0

Sven Baars : gphoto2.ds: Fix Dutch translation and alignment.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 35c6beeba268c315e4f61d876544f527ace59363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c6beeba268c315e4f61d876… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 18:55:37 2010 +0200 gphoto2.ds: Fix Dutch translation and alignment. --- dlls/gphoto2.ds/gphoto2_Nl.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Nl.rc b/dlls/gphoto2.ds/gphoto2_Nl.rc index 39bcdf2..5ee68fd 100644 --- a/dlls/gphoto2.ds/gphoto2_Nl.rc +++ b/dlls/gphoto2.ds/gphoto2_Nl.rc @@ -31,18 +31,18 @@ BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 DEFPUSHBUTTON "Importeer geselecteerde bestanden",IDC_IMPORT,120,252,120,14 - PUSHBUTTON "Preview",IDC_FETCH,7,252,48,14 + PUSHBUTTON "Voorbeeld",IDC_FETCH,7,252,48,14 PUSHBUTTON "Importeer alles",IDC_IMPORTALL,60,252,56,14 - CONTROL "Skip This Dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,244,252,76,14 - PUSHBUTTON "Afsluiten",IDC_EXIT,315,252,50,14 + CONTROL "Sla dit venster over",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,244,252,76,14 + PUSHBUTTON "Afsluiten",IDC_EXIT,320,252,45,14 END IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Transporteren" +CAPTION "Verplaatsen" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Transporteren... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "Verplaatsen... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 @@ -52,5 +52,5 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 LTEXT "Verbinden met camera... Even geduld",IDC_STATIC,128,58, - 116,8 + 120,8 END

1 0

Rico Schüller : d3d10: Parse semantic in parse_fx10_local_variable().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: be3c8db22c138e94459db3ac0adb24f28b3162fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3c8db22c138e94459db3ac0… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:00:44 2010 +0200 d3d10: Parse semantic in parse_fx10_local_variable(). --- dlls/d3d10/effect.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 59b6c31..c43f88a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1284,11 +1284,22 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const { unsigned int i; HRESULT hr; + DWORD offset; hr = parse_fx10_variable_head(v, ptr, data); if (FAILED(hr)) return hr; - skip_dword_unknown(ptr, 2); + read_dword(ptr, &offset); + TRACE("Variable semantic at offset %#x.\n", offset); + + if (!copy_name(data + offset, &v->semantic)) + { + ERR("Failed to copy semantic.\n"); + return E_OUTOFMEMORY; + } + TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); + + skip_dword_unknown(ptr, 1); switch (v->type->basetype) {

1 0

Alexander Nicolaysen Sørnes : objectManager: Add missing parameter to handle_anonymous_submission() call
by Alexander Nicolaysen Sørnes 06 May '10

06 May '10

Module: appdb Branch: master Commit: 951bb19e8ba3ec213bd6da65bcb0714627288661 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=951bb19e8ba3ec213bd6da65… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 6 17:41:31 2010 +0200 objectManager: Add missing parameter to handle_anonymous_submission() call --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index ed6c43e..1f250aa 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1505,7 +1505,7 @@ class ObjectManager $oObject->update(); } else { - $this->handle_anonymous_submission(); + $this->handle_anonymous_submission($aClean); $oObject->create(); }

1 0

Piotr Caban : msvcrt: Added ___mb_cur_max_l_func implementation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 100e925cb421e7db27cf71f77f37111b2a4a6e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=100e925cb421e7db27cf71f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 5 13:37:18 2010 +0200 msvcrt: Added ___mb_cur_max_l_func implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 92db3f0..e430401 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -136,7 +136,7 @@ @ cdecl ___lc_collate_cp_func() msvcrt.___lc_collate_cp_func @ cdecl ___lc_handle_func() msvcrt.___lc_handle_func @ cdecl ___mb_cur_max_func() msvcrt.___mb_cur_max_func -@ stub ___mb_cur_max_l_func +@ cdecl ___mb_cur_max_l_func(ptr) msvcrt.___mb_cur_max_l_func @ cdecl ___setlc_active_func() msvcrt.___setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2f2f275..b09a32d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -133,7 +133,7 @@ @ cdecl ___lc_collate_cp_func() msvcrt.___lc_collate_cp_func @ cdecl ___lc_handle_func() msvcrt.___lc_handle_func @ cdecl ___mb_cur_max_func() msvcrt.___mb_cur_max_func -@ stub ___mb_cur_max_l_func +@ cdecl ___mb_cur_max_l_func(ptr) msvcrt.___mb_cur_max_l_func @ cdecl ___setlc_active_func() msvcrt.___setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cd52f6c..e558808 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -169,6 +169,15 @@ int* CDECL MSVCRT____mb_cur_max_func(void) return &get_locale()->locinfo->mb_cur_max; } +/* ___mb_cur_max_l_func - not exported in native msvcrt */ +int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) +{ + if(!locale) + locale = get_locale(); + + return &locale->locinfo->mb_cur_max; +} + /********************************************************************* * _setmbcp (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6e581df..42fe133 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1436,3 +1436,4 @@ @ cdecl _free_locale(ptr) @ cdecl _configthreadlocale(long) @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl ___mb_cur_max_l_func(ptr)

1 0

Piotr Caban : msvcrt: Added _ui64toa_s implementation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: df038ec544d50888f7e4db717d7e936e1b0db080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df038ec544d50888f7e4db717… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 5 13:37:33 2010 +0200 msvcrt: Added _ui64toa_s implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e430401..b2a19c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -994,7 +994,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ui64toa(long long ptr long) msvcrt._ui64toa -@ stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(long long ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b09a32d..f41362d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -981,7 +981,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ui64toa(long long ptr long) msvcrt._ui64toa -@ stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(long long ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 42fe133..4334b85 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -932,7 +932,7 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(long long ptr long) ntdll._ui64toa -# stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) MSVCRT__ui64toa_s @ cdecl _ui64tow(long long ptr long) ntdll._ui64tow # stub _ui64tow_s @ cdecl _ultoa(long ptr long) ntdll._ultoa diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 35f44ed..e1d9557 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -624,3 +624,41 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas { return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); } + +/********************************************************************* + * _ui64toa_s (MSVCRT.@) + */ +int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, + MSVCRT_size_t size, int radix) +{ + char buffer[65], *pos; + int digit; + + if(!str || radix<2 || radix>36) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + pos = buffer+64; + *pos = '\0'; + + do { + digit = value%radix; + value /= radix; + + if(digit < 10) + *--pos = '0'+digit; + else + *--pos = 'a'+digit-10; + }while(value != 0); + + if(buffer-pos+65 > size) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + memcpy(str, pos, buffer-pos+65); + return 0; +}

1 0

Jacek Caban : mshtml: Fixed IObjectSafety failure handling.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 072ecdf50446b23718c086be5b7e0f1bfab86184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072ecdf50446b23718c086be5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 5 13:21:36 2010 +0200 mshtml: Fixed IObjectSafety failure handling. --- dlls/mshtml/secmgr.c | 19 ++++++-- dlls/mshtml/tests/script.c | 108 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 107 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=072ecdf50446b23718c08…

1 0

Hans Leidekker : msi: Forward MsiDetermineApplicablePatchesA to MsiDetermineApplicablePatchesW.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 881ef98479ed7aa5cb8616bb7008745af1d1e230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881ef98479ed7aa5cb8616bb7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 5 14:37:24 2010 +0200 msi: Forward MsiDetermineApplicablePatchesA to MsiDetermineApplicablePatchesW. --- dlls/msi/msi.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2d33487..646963d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -486,10 +486,43 @@ UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR szPatchPackages, UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR szProductPackagePath, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo) { - FIXME("(%s, %d, %p): stub!\n", debugstr_a(szProductPackagePath), - cPatchInfo, pPatchInfo); + UINT i, r; + WCHAR *package_path = NULL; + MSIPATCHSEQUENCEINFOW *psi; - return ERROR_CALL_NOT_IMPLEMENTED; + TRACE("(%s, %d, %p)\n", debugstr_a(szProductPackagePath), cPatchInfo, pPatchInfo); + + if (szProductPackagePath && !(package_path = strdupAtoW( szProductPackagePath ))) + return ERROR_OUTOFMEMORY; + + psi = msi_alloc( cPatchInfo * sizeof(*psi) ); + if (!psi) + { + msi_free( package_path ); + return ERROR_OUTOFMEMORY; + } + + for (i = 0; i < cPatchInfo; i++) + { + psi[i].szPatchData = strdupAtoW( pPatchInfo[i].szPatchData ); + psi[i].ePatchDataType = pPatchInfo[i].ePatchDataType; + } + + r = MsiDetermineApplicablePatchesW( package_path, cPatchInfo, psi ); + if (r == ERROR_SUCCESS) + { + for (i = 0; i < cPatchInfo; i++) + { + pPatchInfo[i].dwOrder = psi[i].dwOrder; + pPatchInfo[i].uStatus = psi[i].uStatus; + } + } + + msi_free( package_path ); + for (i = 0; i < cPatchInfo; i++) + msi_free( (WCHAR *)psi[i].szPatchData ); + msi_free( psi ); + return r; } static UINT MSI_ApplicablePatchW( MSIPACKAGE *package, LPCWSTR patch )

1 0

Hans Leidekker : msi: Apply registered patches in MsiOpenPackage.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 82d7b04c2cbf5fe1a7f8072d9c66d0abc38252c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d7b04c2cbf5fe1a7f8072d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 5 14:37:55 2010 +0200 msi: Apply registered patches in MsiOpenPackage. --- dlls/msi/action.c | 53 ++++++++++++++++++------------ dlls/msi/msipriv.h | 4 ++ dlls/msi/package.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/patch.c | 8 ++-- 4 files changed, 120 insertions(+), 27 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 35030e2..6ed1417 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -492,7 +492,7 @@ done: return r; } -static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) +UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) { MSIPATCHINFO *pi; UINT r = ERROR_SUCCESS; @@ -520,15 +520,40 @@ static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) return r; } +UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) +{ + UINT i, r = ERROR_SUCCESS; + WCHAR **substorage; + + /* apply substorage transforms */ + substorage = msi_split_string( patch->transforms, ';' ); + for (i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++) + r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); + + msi_free( substorage ); + if (r != ERROR_SUCCESS) + return r; + + msi_set_media_source_prop( package ); + + /* + * There might be a CAB file in the patch package, + * so append it to the list of storages to search for streams. + */ + append_storage_to_db( package->db, patch_db->storage ); + + list_add_tail( &package->patches, &patch->entry ); + return ERROR_SUCCESS; +} + static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) { static const WCHAR dotmsp[] = {'.','m','s','p',0}; MSIDATABASE *patch_db = NULL; WCHAR localfile[MAX_PATH]; - LPWSTR *substorage; MSISUMMARYINFO *si; MSIPATCHINFO *patch = NULL; - UINT i, r = ERROR_SUCCESS; + UINT r = ERROR_SUCCESS; TRACE("%p %s\n", package, debugstr_w( file ) ); @@ -573,23 +598,9 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) } patch->localfile = strdupW( localfile ); - /* apply substorage transforms */ - substorage = msi_split_string( patch->transforms, ';' ); - for ( i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++ ) - r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); - - msi_free( substorage ); - if (r != ERROR_SUCCESS) - goto done; - msi_set_media_source_prop( package ); - - /* - * There might be a CAB file in the patch package, - * so append it to the list of storages to search for streams. - */ - append_storage_to_db( package->db, patch_db->storage ); - - list_add_tail( &package->patches, &patch->entry ); + r = msi_apply_patch_db( package, patch_db, patch ); + if ( r != ERROR_SUCCESS ) + WARN("patch failed to apply %u\n", r); done: msiobj_release( &si->hdr ); @@ -729,7 +740,7 @@ static BOOL needs_ui_sequence(MSIPACKAGE *package) return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; } -static UINT msi_set_context(MSIPACKAGE *package) +UINT msi_set_context(MSIPACKAGE *package) { int num; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 354aca5..a8737a2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -685,7 +685,10 @@ extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ); extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); +/* patch functions */ extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ); +extern UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ); +extern UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ); /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); @@ -758,6 +761,7 @@ extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ); extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); extern UINT msi_clone_properties(MSIPACKAGE *); +extern UINT msi_set_context(MSIPACKAGE *); extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT); /* for deformating */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2ffd66e..e53de53 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1048,6 +1048,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) msi_clone_properties( package ); package->ProductCode = msi_dup_property( package->db, szProductCode ); + package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); + set_installed_prop( package ); set_installer_properties( package ); @@ -1167,6 +1169,60 @@ UINT msi_get_local_package_name( LPWSTR path, LPCWSTR suffix ) return ERROR_SUCCESS; } +static UINT apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) +{ + UINT r; + DWORD len; + WCHAR patch_file[MAX_PATH]; + MSIDATABASE *patch_db; + MSIPATCHINFO *patch_info; + MSISUMMARYINFO *si; + + len = sizeof(patch_file) / sizeof(WCHAR); + r = MsiGetPatchInfoExW( patch_code, package->ProductCode, NULL, package->Context, + INSTALLPROPERTY_LOCALPACKAGEW, patch_file, &len ); + if (r != ERROR_SUCCESS) + { + ERR("failed to get patch filename %u\n", r); + return r; + } + + r = MSI_OpenDatabaseW( patch_file, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &patch_db ); + if (r != ERROR_SUCCESS) + { + ERR("failed to open patch database %s\n", debugstr_w( patch_file )); + return r; + } + + si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); + if (!si) + { + msiobj_release( &patch_db->hdr ); + return ERROR_FUNCTION_FAILED; + } + + r = msi_parse_patch_summary( si, &patch_info ); + msiobj_release( &si->hdr ); + if (r != ERROR_SUCCESS) + { + ERR("failed to parse patch summary %u\n", r); + msiobj_release( &patch_db->hdr ); + return r; + } + + r = msi_apply_patch_db( package, patch_db, patch_info ); + msiobj_release( &patch_db->hdr ); + if (r != ERROR_SUCCESS) + { + ERR("failed to apply patch %u\n", r); + msi_free( patch_info->patchcode ); + msi_free( patch_info->transforms ); + msi_free( patch_info->localfile ); + msi_free( patch_info ); + } + return r; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR OriginalDatabase[] = @@ -1180,6 +1236,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) UINT r; WCHAR temppath[MAX_PATH], localfile[MAX_PATH], cachefile[MAX_PATH]; LPCWSTR file = szPackage; + DWORD index = 0; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -1293,9 +1350,30 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) msi_set_property( package->db, OriginalDatabase, fullpath ); } - package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); - *pPackage = package; + msi_set_context( package ); + + while (1) + { + WCHAR patch_code[GUID_SIZE]; + r = MsiEnumPatchesExW( package->ProductCode, NULL, package->Context, + MSIPATCHSTATE_APPLIED, index, patch_code, NULL, NULL, NULL, NULL ); + if (r != ERROR_SUCCESS) + break; + + TRACE("found registered patch %s\n", debugstr_w(patch_code)); + r = apply_registered_patch( package, patch_code ); + if (r != ERROR_SUCCESS) + { + ERR("registered patch failed to apply %u\n", r); + MSI_FreePackage( (MSIOBJECTHDR *)package ); + return r; + } + + index++; + } + + *pPackage = package; return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index e386925..2c7459d 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -731,7 +731,7 @@ static void test_simple_patch( void ) ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); r = MsiViewFetch( hview, &hrec ); - todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); MsiCloseHandle( hrec ); MsiViewClose( hview ); @@ -942,13 +942,13 @@ static void test_system_tables( void ) ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); r = find_entry( hdb, "_Tables", "MsiPatchHeaders" ); - todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); r = find_entry( hdb, "_Tables", "Patch" ); - todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); r = find_entry( hdb, "_Tables", "PatchPackage" ); - todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); MsiCloseHandle( hdb ); MsiCloseHandle( hproduct );

1 0