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

Hans Leidekker : msi: Fix the service actions to revert components to the installed state during rollback .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 7dd95a386eb499ee7d5b5042eda1f08d4424e880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd95a386eb499ee7d5b5042e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:51:33 2011 +0200 msi: Fix the service actions to revert components to the installed state during rollback. --- dlls/msi/action.c | 44 ++++++++++++-------------------------------- 1 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8e4f2e1..9a55afc 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5517,9 +5517,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) WARN("service component not found\n"); goto done; } - if (!component->Enabled) + component->Action = msi_get_component_action( package, component ); + if (component->Action != INSTALLSTATE_LOCAL) { - TRACE("service component disabled\n"); + TRACE("component not scheduled for installation %s\n", debugstr_w(comp)); goto done; } hscm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, GENERIC_WRITE); @@ -5680,19 +5681,12 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) - { - TRACE("component is disabled\n"); - return ERROR_SUCCESS; - } - - if (comp->ActionRequest != INSTALLSTATE_LOCAL) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); - comp->Action = comp->Installed; + TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); @@ -5878,19 +5872,12 @@ static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) - { - TRACE("component is disabled\n"); - return ERROR_SUCCESS; - } - - if (comp->ActionRequest != INSTALLSTATE_ABSENT) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("Component not scheduled for removal: %s\n", debugstr_w(component)); - comp->Action = comp->Installed; + TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_ABSENT; scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); if (!scm) @@ -5961,19 +5948,12 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) - { - TRACE("component is disabled\n"); - return ERROR_SUCCESS; - } - - if (comp->ActionRequest != INSTALLSTATE_ABSENT) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("Component not scheduled for removal: %s\n", debugstr_w(component)); - comp->Action = comp->Installed; + TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_ABSENT; deformat_string( package, MSI_RecordGetString(rec, 2), &name ); stop_service( name );

1 0

Hans Leidekker : msi: Fix the ODBC actions to revert components to the installed state during rollback .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: fe2b4b1df6ce94ecfe60f172a1e6882c2d96fb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2b4b1df6ce94ecfe60f172a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:51:52 2011 +0200 msi: Fix the ODBC actions to revert components to the installed state during rollback. --- dlls/msi/action.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a55afc..22b02ae 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6041,12 +6041,12 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); @@ -6133,12 +6133,12 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); @@ -6219,9 +6219,10 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; } @@ -6312,9 +6313,10 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } @@ -6350,9 +6352,10 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } @@ -6394,9 +6397,10 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Fix the font actions to revert components to the installed state during rollback .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: df2df89dbd4bb67ff72302f1e9912341019bd0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2df89dbd4bb67ff72302f1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:52:07 2011 +0200 msi: Fix the font actions to revert components to the installed state during rollback. --- dlls/msi/font.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index b5493a0..aea5702 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -207,6 +207,7 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) LPWSTR name; LPCWSTR filename; MSIFILE *file; + MSICOMPONENT *comp; HKEY hkey1, hkey2; MSIRECORD *uirow; LPWSTR uipath, p; @@ -215,19 +216,19 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) file = msi_get_loaded_file( package, filename ); if (!file) { - ERR("Unable to load file\n"); + WARN("unable to find file %s\n", debugstr_w(file->File)); return ERROR_SUCCESS; } - - if (!file->Component->Enabled) + comp = msi_get_loaded_component( package, file->Component->Component ); + if (!comp) { - TRACE("component is disabled\n"); + WARN("unable to find component %s\n", debugstr_w(comp->Component)); return ERROR_SUCCESS; } - - if (file->Component->ActionRequest != INSTALLSTATE_LOCAL) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("Component not scheduled for installation\n"); + TRACE("component not scheduled for installation %s\n", debugstr_w(comp->Component)); return ERROR_SUCCESS; } @@ -291,6 +292,7 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param ) LPWSTR name; LPCWSTR filename; MSIFILE *file; + MSICOMPONENT *comp; HKEY hkey1, hkey2; MSIRECORD *uirow; LPWSTR uipath, p; @@ -299,19 +301,19 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param ) file = msi_get_loaded_file( package, filename ); if (!file) { - ERR("Unable to load file\n"); + WARN("unable to find file %s\n", debugstr_w(file->File)); return ERROR_SUCCESS; } - - if (!file->Component->Enabled) + comp = msi_get_loaded_component( package, file->Component->Component ); + if (!comp) { - TRACE("component is disabled\n"); + WARN("unable to find component %s\n", debugstr_w(comp->Component)); return ERROR_SUCCESS; } - - if (file->Component->ActionRequest != INSTALLSTATE_ABSENT) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("Component not scheduled for removal\n"); + TRACE("component not scheduled for removal %s\n", debugstr_w(comp->Component)); return ERROR_SUCCESS; }

1 0

André Hentschel : mscoree/tests: Fix for the results in CreateConfigStream tests.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: b426a9a0848a95f2ad63b9a32897571f8da47e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b426a9a0848a95f2ad63b9a32… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 23 21:14:34 2011 +0200 mscoree/tests: Fix for the results in CreateConfigStream tests. --- dlls/mscoree/tests/mscoree.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index f80dbb4..308db41 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -287,13 +287,14 @@ static void test_createconfigstream(void) GetFullPathNameW(file, MAX_PATH, path, NULL); hr = pCreateConfigStream(NULL, &stream); - todo_wine ok(hr == E_FAIL, "CreateConfigStream returned %x\n", hr); + todo_wine ok(hr == E_FAIL || broken(hr == ERROR_PROC_NOT_FOUND), /* some WinXP, Win2K3 and Win7 */ + "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(path, NULL); - todo_wine ok(hr == E_POINTER, "CreateConfigStream returned %x\n", hr); + todo_wine ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(NULL, NULL); - todo_wine ok(hr == E_POINTER, "CreateConfigStream returned %x\n", hr); + todo_wine ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(nonexistent, &stream); todo_wine ok(hr == COR_E_FILENOTFOUND, "CreateConfigStream returned %x\n", hr);

1 0

Hans Leidekker : msi: Move patch related functions to a separate file.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 02fb530401132cac21406cbf81842d602c9e9baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fb530401132cac21406cbf8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:49:37 2011 +0200 msi: Move patch related functions to a separate file. --- dlls/msi/Makefile.in | 1 + dlls/msi/action.c | 751 -------------------------------------------------- dlls/msi/msipriv.h | 2 + dlls/msi/patch.c | 719 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 722 insertions(+), 751 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02fb530401132cac21406…

1 0

Hans Leidekker : msi: Improve the BindImage action stub.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: f644601fc5a704d49e991d8517b91fa7f986b982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f644601fc5a704d49e991d851… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:49:56 2011 +0200 msi: Improve the BindImage action stub. --- dlls/msi/Makefile.in | 2 +- dlls/msi/action.c | 68 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 3954e9e..c12b25d 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,7 +1,7 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 -DELAYIMPORTS = odbccp32 wintrust crypt32 +DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp C_SRCS = \ action.c \ diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 61c0783..291f283 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -36,6 +36,7 @@ #include "objbase.h" #include "mscoree.h" #include "shlwapi.h" +#include "imagehlp.h" #include "wine/unicode.h" #include "winver.h" @@ -7097,7 +7098,6 @@ static UINT ACTION_MigrateFeatureStates( MSIPACKAGE *package ) { UINT r; MSIQUERY *view; - static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','U','p','g','r','a','d','e',0}; @@ -7121,6 +7121,66 @@ static UINT ACTION_MigrateFeatureStates( MSIPACKAGE *package ) return ERROR_SUCCESS; } +static void bind_image( const char *filename, const char *path ) +{ + if (!BindImageEx( 0, filename, path, NULL, NULL )) + { + WARN("failed to bind image %u\n", GetLastError()); + } +} + +static UINT ITERATE_BindImage( MSIRECORD *rec, LPVOID param ) +{ + UINT i; + MSIFILE *file; + MSIPACKAGE *package = param; + const WCHAR *key = MSI_RecordGetString( rec, 1 ); + const WCHAR *paths = MSI_RecordGetString( rec, 2 ); + char *filenameA, *pathA; + WCHAR *pathW, **path_list; + + if (!(file = msi_get_loaded_file( package, key ))) + { + WARN("file %s not found\n", debugstr_w(key)); + return ERROR_SUCCESS; + } + if (!(filenameA = strdupWtoA( file->TargetPath ))) return ERROR_SUCCESS; + path_list = msi_split_string( paths, ';' ); + if (!path_list) bind_image( filenameA, NULL ); + else + { + for (i = 0; path_list[i] && path_list[i][0]; i++) + { + deformat_string( package, path_list[i], &pathW ); + if ((pathA = strdupWtoA( pathW ))) + { + bind_image( filenameA, pathA ); + msi_free( pathA ); + } + msi_free( pathW ); + } + } + msi_free( path_list ); + msi_free( filenameA ); + return ERROR_SUCCESS; +} + +static UINT ACTION_BindImage( MSIPACKAGE *package ) +{ + UINT r; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','B','i','n','d','I','m','a','g','e',0}; + + r = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (r == ERROR_SUCCESS) + { + r = MSI_IterateRecords( view, NULL, ITERATE_BindImage, package ); + msiobj_release( &view->hdr ); + } + return ERROR_SUCCESS; +} + static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) { @@ -7145,12 +7205,6 @@ static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, return ERROR_SUCCESS; } -static UINT ACTION_BindImage( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'B','i','n','d','I','m','a','g','e',0 }; - return msi_unimplemented_action_stub( package, "BindImage", table ); -} - static UINT ACTION_IsolateComponents( MSIPACKAGE *package ) { static const WCHAR table[] = {

1 0

Hans Leidekker : msi: Improve the stub for MsiGetMode(MSIRUNMODE_ADVERTISE) .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 6ec7306948aa0614d955e45ec8b60589ced89b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec7306948aa0614d955e45ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:50:12 2011 +0200 msi: Improve the stub for MsiGetMode(MSIRUNMODE_ADVERTISE). --- dlls/msi/install.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 0e57d6b..31ab558 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -732,7 +732,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) { case MSIRUNMODE_ADMIN: FIXME("no support for administrative installs\n"); - r = FALSE; + break; + + case MSIRUNMODE_ADVERTISE: + FIXME("no support for advertised installs\n"); break; case MSIRUNMODE_WINDOWS9X:

1 0

Hans Leidekker : msi: Fix the folder actions to revert components to the installed state during rollback .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: b7950cfe68e216b3cee93364597867aa54486acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7950cfe68e216b3cee933645… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:50:28 2011 +0200 msi: Fix the folder actions to revert components to the installed state during rollback. --- dlls/msi/action.c | 46 +++++++++++++++++++++++----------------------- dlls/msi/msipriv.h | 2 ++ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 291f283..54bdc87 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -816,6 +816,17 @@ void msi_ui_actiondata( MSIPACKAGE *package, const WCHAR *action, MSIRECORD *rec msiobj_release( &row->hdr ); } +INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) +{ + if (!comp->Enabled) + { + TRACE("component is disabled: %s\n", debugstr_w(comp->Component)); + return INSTALLSTATE_UNKNOWN; + } + if (package->need_rollback) return comp->Installed; + return comp->ActionRequest; +} + static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; @@ -832,19 +843,12 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) - { - TRACE("component is disabled\n"); - return ERROR_SUCCESS; - } - - if (comp->ActionRequest != INSTALLSTATE_LOCAL) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); - comp->Action = comp->Installed; + TRACE("component not scheduled for installation: %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; dir = MSI_RecordGetString(row,1); if (!dir) @@ -907,19 +911,12 @@ static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) - { - TRACE("component is disabled\n"); - return ERROR_SUCCESS; - } - - if (comp->ActionRequest != INSTALLSTATE_ABSENT) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("Component not scheduled for removal: %s\n", debugstr_w(component)); - comp->Action = comp->Installed; + TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_ABSENT; dir = MSI_RecordGetString( row, 1 ); if (!dir) @@ -7468,7 +7465,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { UINT rc; - BOOL ui_exists, needs_rollback = FALSE; + BOOL ui_exists; static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; @@ -7565,13 +7562,16 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, else /* failed */ { ACTION_PerformActionSequence(package, -3); - needs_rollback = TRUE; + if (!msi_get_property_int( package->db, szRollbackDisabled, 0 )) + { + package->need_rollback = TRUE; + } } /* finish up running custom actions */ ACTION_FinishCustomActions(package); - if (needs_rollback && !msi_get_property_int( package->db, szRollbackDisabled, 0 )) + if (package->need_rollback) { WARN("installation failed, running rollback script\n"); msi_set_property( package->db, szRollbackDisabled, NULL ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index acef756..4e2e312 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -400,6 +400,7 @@ typedef struct tagMSIPACKAGE unsigned char commit_action_running : 1; unsigned char rollback_action_running : 1; unsigned char need_reboot : 1; + unsigned char need_rollback : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW @@ -771,6 +772,7 @@ extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMod extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ) DECLSPEC_HIDDEN; extern UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) DECLSPEC_HIDDEN; +extern INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) DECLSPEC_HIDDEN; /* record internals */ extern void MSI_CloseRecord( MSIOBJECTHDR * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Fix the file actions to revert components to the installed state during rollback .
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: c88f128537a49858094714da7a858d9637811cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88f128537a49858094714da7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 24 10:50:43 2011 +0200 msi: Fix the file actions to revert components to the installed state during rollback. --- dlls/msi/files.c | 76 ++++++++++++++--------------------------------------- 1 files changed, 20 insertions(+), 56 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 97dbfa0..8b2feb9 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -63,7 +63,7 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac msi_ui_progress( package, 2, f->FileSize, 0, 0 ); } -static msi_file_state calculate_install_state( MSIFILE *file ) +static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *file ) { MSICOMPONENT *comp = file->Component; VS_FIXEDFILEINFO *file_version; @@ -71,8 +71,8 @@ static msi_file_state calculate_install_state( MSIFILE *file ) msi_file_state state; DWORD file_size; - if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || - (comp->assembly && comp->assembly->installed)) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) { TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); return msifs_skipped; @@ -147,13 +147,12 @@ static void schedule_install_files(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - file->state = calculate_install_state( file ); + file->state = calculate_install_state( package, file ); if (file->state == msifs_overwrite && (comp->Attributes & msidbComponentAttributesNeverOverwrite)) { TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); file->state = msifs_skipped; } - comp->Action = INSTALLSTATE_LOCAL; msi_ui_progress( package, 2, file->FileSize, 0, 0 ); } } @@ -393,8 +392,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - if (comp->ActionRequest == INSTALLSTATE_LOCAL && comp->Enabled && - comp->assembly && !comp->assembly->installed) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action == INSTALLSTATE_LOCAL && comp->assembly && !comp->assembly->installed) { rc = msi_install_assembly( package, comp ); if (rc != ERROR_SUCCESS) @@ -783,20 +782,13 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - if (comp->ActionRequest != INSTALLSTATE_LOCAL && comp->ActionRequest != INSTALLSTATE_SOURCE) - { - TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); - comp->Action = comp->Installed; - return ERROR_SUCCESS; - } - comp->Action = comp->ActionRequest; - sourcename = MSI_RecordGetString(rec, 3); options = MSI_RecordGetInteger(rec, 7); @@ -979,20 +971,13 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - if (comp->ActionRequest != INSTALLSTATE_LOCAL) - { - TRACE("Component not scheduled for installation %s\n", debugstr_w(component)); - comp->Action = comp->Installed; - return ERROR_SUCCESS; - } - comp->Action = INSTALLSTATE_LOCAL; - file_key = MSI_RecordGetString(row,3); if (!file_key) { @@ -1067,20 +1052,13 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("component is disabled\n"); + TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - if (comp->ActionRequest != INSTALLSTATE_ABSENT) - { - TRACE("Component not scheduled for removal %s\n", debugstr_w(component)); - comp->Action = comp->Installed; - return ERROR_SUCCESS; - } - comp->Action = INSTALLSTATE_ABSENT; - file_key = MSI_RecordGetString( row, 3 ); if (!file_key) { @@ -1139,15 +1117,13 @@ UINT ACTION_RemoveDuplicateFiles( MSIPACKAGE *package ) static BOOL verify_comp_for_removal(MSICOMPONENT *comp, UINT install_mode) { - INSTALLSTATE request = comp->ActionRequest; - /* special case */ - if (request != INSTALLSTATE_SOURCE && + if (comp->Action != INSTALLSTATE_SOURCE && comp->Attributes & msidbComponentAttributesSourceOnly && (install_mode == msidbRemoveFileInstallModeOnRemove || install_mode == msidbRemoveFileInstallModeOnBoth)) return TRUE; - switch (request) + switch (comp->Action) { case INSTALLSTATE_LOCAL: case INSTALLSTATE_SOURCE: @@ -1182,16 +1158,10 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) if (!comp) return ERROR_SUCCESS; - if (!comp->Enabled) - { - TRACE("component is disabled\n"); - return ERROR_SUCCESS; - } - + comp->Action = msi_get_component_action( package, comp ); if (!verify_comp_for_removal(comp, install_mode)) { TRACE("Skipping removal due to install mode\n"); - comp->Action = comp->Installed; return ERROR_SUCCESS; } @@ -1300,16 +1270,10 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); - if ( file->Component->ActionRequest != INSTALLSTATE_ABSENT || - file->Component->Installed == INSTALLSTATE_SOURCE ) + file->Component->Action = msi_get_component_action( package, file->Component ); + if (file->Component->Action != INSTALLSTATE_ABSENT || file->Component->Installed == INSTALLSTATE_SOURCE) continue; - if (!file->Component->Enabled) - { - TRACE("component is disabled\n"); - continue; - } - if (file->Component->Attributes & msidbComponentAttributesPermanent) { TRACE("permanent component, not removing file\n");

1 0

Henri Verbeet : ddraw/tests: Fix the depth clamping test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 1db6a7e4507b5d1d35a366d0ee71617e428f32eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db6a7e4507b5d1d35a366d0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 23 22:11:37 2011 +0200 ddraw/tests: Fix the depth clamping test. --- dlls/ddraw/tests/visual.c | 109 ++++++++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 56 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 2b4cf23..5eec1c8 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -125,19 +125,7 @@ static BOOL createObjects(void) if (FAILED(hr)) goto err; hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DTnLHalDevice, Surface, &Direct3DDevice); - if(FAILED(hr)) - { - trace("Creating a TnLHal Device failed, trying HAL\n"); - hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DHALDevice, Surface, &Direct3DDevice); - if(FAILED(hr)) - { - trace("Creating a HAL device failed, trying Ref\n"); - hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DRefDevice, Surface, &Direct3DDevice); - if (SUCCEEDED(hr)) - refdevice = TRUE; - } - } - if(!Direct3DDevice) goto err; + if (FAILED(hr) || !Direct3DDevice) goto err; return TRUE; err: @@ -2801,55 +2789,58 @@ out: } /* This test tests depth clamping / clipping behaviour: - * - When D3DRS_CLIPPING is disabled depth values are *clamped* to the - * minimum/maximum z value. + * - With software vertex processing, depth values are clamped to the + * minimum / maximum z value when D3DRS_CLIPPING is disabled, and clipped + * when D3DRS_CLIPPING is enabled. Pretransformed vertices behave the + * same as regular vertices here. + * - With hardware vertex processing, D3DRS_CLIPPING seems to be ignored. + * Normal vertices are always clipped. Pretransformed vertices are + * clipped when D3DPMISCCAPS_CLIPTLVERTS is set, clamped when it isn't. * - The viewport's MinZ/MaxZ is irrelevant for this. - * - When D3DRS_CLIPPING is enabled depth values are clipped. - * - Pretransformed vertices behave the same as regular vertices. */ static void depth_clamp_test(IDirect3DDevice7 *device) { struct tvertex quad1[] = { - { 0, 0, 5.0f, 1.0, 0xff002b7f}, - { 640, 0, 5.0f, 1.0, 0xff002b7f}, - { 0, 480, 5.0f, 1.0, 0xff002b7f}, - { 640, 480, 5.0f, 1.0, 0xff002b7f}, + { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, + {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, + { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, + {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, }; struct tvertex quad2[] = { - { 0, 300, 10.0f, 1.0, 0xfff9e814}, - { 640, 300, 10.0f, 1.0, 0xfff9e814}, - { 0, 360, 10.0f, 1.0, 0xfff9e814}, - { 640, 360, 10.0f, 1.0, 0xfff9e814}, + { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, + {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, + { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, + {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, }; - struct vertex quad3[] = + struct tvertex quad3[] = { - {-0.65, 0.55, 5.0f, 0xffffffff}, - {-0.35, 0.55, 5.0f, 0xffffffff}, - {-0.65, 0.15, 5.0f, 0xffffffff}, - {-0.35, 0.15, 5.0f, 0xffffffff}, + {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, + {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, + {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, + {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, }; - struct vertex quad4[] = + struct tvertex quad4[] = { - {-0.87, 0.83, 10.0f, 0xffffffff}, - {-0.65, 0.83, 10.0f, 0xffffffff}, - {-0.87, 0.55, 10.0f, 0xffffffff}, - {-0.65, 0.55, 10.0f, 0xffffffff}, + { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, + {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, + { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, + {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; struct vertex quad5[] = { - { -0.5, 0.5, 10.0f, 0xff14f914}, - { 0.5, 0.5, 10.0f, 0xff14f914}, - { -0.5, -0.5, 10.0f, 0xff14f914}, - { 0.5, -0.5, 10.0f, 0xff14f914}, + { -0.5f, 0.5f, 10.0f, 0xff14f914}, + { 0.5f, 0.5f, 10.0f, 0xff14f914}, + { -0.5f, -0.5f, 10.0f, 0xff14f914}, + { 0.5f, -0.5f, 10.0f, 0xff14f914}, }; - struct tvertex quad6[] = + struct vertex quad6[] = { - { 0, 120, 10.0f, 1.0, 0xfff91414}, - { 640, 120, 10.0f, 1.0, 0xfff91414}, - { 0, 180, 10.0f, 1.0, 0xfff91414}, - { 640, 180, 10.0f, 1.0, 0xfff91414}, + { -1.0f, 0.5f, 10.0f, 0xfff91414}, + { 1.0f, 0.5f, 10.0f, 0xfff91414}, + { -1.0f, 0.25f, 10.0f, 0xfff91414}, + { 1.0f, 0.25f, 10.0f, 0xfff91414}, }; D3DVIEWPORT7 vp; @@ -2866,7 +2857,7 @@ static void depth_clamp_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetViewport(device, &vp); ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); - hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); @@ -2885,34 +2876,40 @@ static void depth_clamp_test(IDirect3DDevice7 *device) ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad2, 4, 0); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); - hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad3, 4, 0); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad3, 4, 0); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); - hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad4, 4, 0); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad4, 4, 0); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); - hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, TRUE); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad5, 4, 0); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); - hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad6, 4, 0); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad6, 4, 0); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 75, 75); - ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + todo_wine ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - ok(color_match(color, 0x00ffffff, 1) || - broken(color == 0x00f91414), /* Reference rasterizer */ - "color 0x%08x.\n", color); + todo_wine ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + todo_wine ok(color_match(color, 0x00002b7f, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + todo_wine ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + todo_wine ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); vp.dvMinZ = 0.0; vp.dvMaxZ = 1.0;

1 0