August 2008 - Wine-commits - list.winehq.org

James Hawkins : msi: Skip the component action detection logic if there is no product code.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 3bec162d51d25c47fd6c57a91908f118108a95b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bec162d51d25c47fd6c57a91… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 25 00:07:52 2008 -0500 msi: Skip the component action detection logic if there is no product code. --- dlls/msi/action.c | 16 ++++++++-------- dlls/msi/helpers.c | 12 ++++++------ dlls/msi/msipriv.h | 11 +++++++++-- dlls/msi/tests/format.c | 5 +---- dlls/msi/tests/package.c | 30 ++++++------------------------ 5 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a0b0a22..8cd5923 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1193,7 +1193,7 @@ static UINT load_component( MSIRECORD *row, LPVOID param ) comp->KeyPath = msi_dup_record_field( row, 6 ); comp->Installed = INSTALLSTATE_UNKNOWN; - msi_component_set_state( comp, INSTALLSTATE_UNKNOWN ); + msi_component_set_state(package, comp, INSTALLSTATE_UNKNOWN); return ERROR_SUCCESS; } @@ -1943,34 +1943,34 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { if ((component->Attributes & msidbComponentAttributesSourceOnly) && !component->ForceLocalState) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); else - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); continue; } /* if any feature is local, the component must be local too */ if (component->hasLocalFeature) { - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); continue; } if (component->hasSourceFeature) { - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); continue; } if (component->hasAdvertiseFeature) { - msi_component_set_state( component, INSTALLSTATE_ADVERTISED ); + msi_component_set_state(package, component, INSTALLSTATE_ADVERTISED); continue; } TRACE("nobody wants component %s\n", debugstr_w(component->Component)); if (component->anyAbsent) - msi_component_set_state(component, INSTALLSTATE_ABSENT); + msi_component_set_state(package, component, INSTALLSTATE_ABSENT); } LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) @@ -1978,7 +1978,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) if (component->Action == INSTALLSTATE_DEFAULT) { TRACE("%s was default, setting to local\n", debugstr_w(component->Component)); - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); } TRACE("Result: Component %s (Installed %i, Action %i)\n", diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 4e20a27..2364536 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -891,7 +891,7 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) continue; if (newstate == INSTALLSTATE_LOCAL) - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); else { ComponentList *clist; @@ -899,7 +899,7 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) component->hasLocalFeature = FALSE; - msi_component_set_state( component, newstate ); + msi_component_set_state(package, component, newstate); /*if any other feature wants is local we need to set it local*/ LIST_FOR_EACH_ENTRY( f, &package->features, MSIFEATURE, entry ) @@ -922,14 +922,14 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) if (component->Attributes & msidbComponentAttributesOptional) { if (f->Attributes & msidbFeatureAttributesFavorSource) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); else - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); } else if (component->Attributes & msidbComponentAttributesSourceOnly) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + msi_component_set_state(package, component, INSTALLSTATE_SOURCE); else - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + msi_component_set_state(package, component, INSTALLSTATE_LOCAL); } } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cfb5c41..3a33bfb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -901,9 +901,16 @@ static inline void msi_feature_set_state(MSIPACKAGE *package, } } -static inline void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE state ) +static inline void msi_component_set_state(MSIPACKAGE *package, + MSICOMPONENT *comp, + INSTALLSTATE state) { - if (state == INSTALLSTATE_ABSENT) + if (!package->ProductCode) + { + comp->ActionRequest = state; + comp->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) { switch (comp->Installed) { diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 5272e0d..00d3856 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2417,10 +2417,7 @@ static void test_formatrecord_tables(void) MsiRecordSetString( hrec, 1, "[$parietal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); - } + ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); sprintf( buf, "%sI am a really long directory\\temporal.txt", root ); DeleteFile( buf ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 54c307d..ec299ea 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5830,10 +5830,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "virgo", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected virgo INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5854,10 +5851,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "cepheus", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected cepheus INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5878,10 +5872,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "monoceros", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected monoceros INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected monoceros INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected monoceros INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5940,10 +5931,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "virgo", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected virgo INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected virgo INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5964,20 +5952,14 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "cepheus", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected cepheus INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected cepheus INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "andromeda", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected andromeda INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected andromeda INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected andromeda INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: Skip the feature action detection logic if there is no product code.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: d596ae29d8b4d87c3183bbf2f79e5d856a65086b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d596ae29d8b4d87c3183bbf2f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 25 00:07:18 2008 -0500 msi: Skip the feature action detection logic if there is no product code. --- dlls/msi/action.c | 25 +++++++++++++------------ dlls/msi/dialog.c | 2 +- dlls/msi/events.c | 6 +++--- dlls/msi/install.c | 2 +- dlls/msi/msipriv.h | 11 +++++++++-- dlls/msi/tests/package.c | 5 +---- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f165109..a0b0a22 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1327,7 +1327,7 @@ static UINT load_feature(MSIRECORD * row, LPVOID param) feature->Attributes = MSI_RecordGetInteger(row,8); feature->Installed = INSTALLSTATE_UNKNOWN; - msi_feature_set_state( feature, INSTALLSTATE_UNKNOWN ); + msi_feature_set_state(package, feature, INSTALLSTATE_UNKNOWN); list_add_tail( &package->features, &feature->entry ); @@ -1754,7 +1754,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, continue; if (strcmpiW(override,all)==0) - msi_feature_set_state( feature, state ); + msi_feature_set_state(package, feature, state); else { LPWSTR ptr = override; @@ -1765,7 +1765,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, if ((ptr2 && strncmpW(ptr,feature->Feature, ptr2-ptr)==0) || (!ptr2 && strcmpW(ptr,feature->Feature)==0)) { - msi_feature_set_state(feature, state); + msi_feature_set_state(package, feature, state); break; } if (ptr2) @@ -1841,11 +1841,11 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) if ((feature_state) && (feature->Action == INSTALLSTATE_UNKNOWN)) { if (feature->Attributes & msidbFeatureAttributesFavorSource) - msi_feature_set_state( feature, INSTALLSTATE_SOURCE ); + msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); else if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) - msi_feature_set_state( feature, INSTALLSTATE_ADVERTISED ); + msi_feature_set_state(package, feature, INSTALLSTATE_ADVERTISED); else - msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); } } @@ -1858,7 +1858,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) continue; LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - msi_feature_set_state( fl->feature, INSTALLSTATE_UNKNOWN ); + msi_feature_set_state(package, fl->feature, INSTALLSTATE_UNKNOWN); } } else @@ -1891,7 +1891,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) cl->component->ForceLocalState && feature->Action == INSTALLSTATE_SOURCE) { - msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); break; } } @@ -5736,7 +5736,8 @@ static BOOL init_functionpointers(void) return TRUE; } -static UINT install_assembly(MSIASSEMBLY *assembly, LPWSTR path) +static UINT install_assembly(MSIPACKAGE *package, MSIASSEMBLY *assembly, + LPWSTR path) { IAssemblyCache *cache; HRESULT hr; @@ -5745,7 +5746,7 @@ static UINT install_assembly(MSIASSEMBLY *assembly, LPWSTR path) TRACE("installing assembly: %s\n", debugstr_w(path)); if (assembly->feature) - msi_feature_set_state(assembly->feature, INSTALLSTATE_LOCAL); + msi_feature_set_state(package, assembly->feature, INSTALLSTATE_LOCAL); if (assembly->manifest) FIXME("Manifest unhandled\n"); @@ -5905,7 +5906,7 @@ static BOOL installassembly_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, { assembly->installed = TRUE; - r = install_assembly(assembly, temppath); + r = install_assembly(package, assembly, temppath); if (r != ERROR_SUCCESS) ERR("Failed to install assembly\n"); } @@ -5970,7 +5971,7 @@ static UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) { lstrcpyW(path, assembly->file->SourcePath); - r = install_assembly(assembly, path); + r = install_assembly(package, assembly, path); if (r != ERROR_SUCCESS) ERR("Failed to install assembly\n"); } diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8c7c59a..add7876 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1909,7 +1909,7 @@ msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) case INSTALLSTATE_LOCAL: case INSTALLSTATE_ADVERTISED: case INSTALLSTATE_ABSENT: - msi_feature_set_state( feature, r ); + msi_feature_set_state(package, feature, r); break; default: FIXME("select feature and all children\n"); diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 6b6ead9..79e1f66 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -180,7 +180,7 @@ static UINT ControlEvent_AddLocal(MSIPACKAGE* package, LPCWSTR argument, else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); ACTION_UpdateComponentStates(package,argument); } @@ -200,7 +200,7 @@ static UINT ControlEvent_Remove(MSIPACKAGE* package, LPCWSTR argument, else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state( feature, INSTALLSTATE_ABSENT ); + msi_feature_set_state(package, feature, INSTALLSTATE_ABSENT); ACTION_UpdateComponentStates(package,argument); } @@ -220,7 +220,7 @@ static UINT ControlEvent_AddSource(MSIPACKAGE* package, LPCWSTR argument, else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state( feature, INSTALLSTATE_SOURCE ); + msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); ACTION_UpdateComponentStates(package,argument); } return ERROR_SUCCESS; diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 6415459..95fe51a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -774,7 +774,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE* package, LPCWSTR szFeature, feature->Attributes & msidbFeatureAttributesDisallowAdvertise) return ERROR_FUNCTION_FAILED; - msi_feature_set_state( feature, iState ); + msi_feature_set_state(package, feature, iState); ACTION_UpdateComponentStates(package,szFeature); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e6ce9da..cfb5c41 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -854,9 +854,16 @@ extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UIN extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute); -static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state ) +static inline void msi_feature_set_state(MSIPACKAGE *package, + MSIFEATURE *feature, + INSTALLSTATE state) { - if (state == INSTALLSTATE_ABSENT) + if (!package->ProductCode) + { + feature->ActionRequest = state; + feature->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) { switch (feature->Installed) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ab34e81..54c307d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5926,10 +5926,7 @@ static void test_featureparents(void) r = MsiGetFeatureState(hpkg, "orion", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected orion INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_ABSENT, "Expected orion INSTALLSTATE_ABSENT, got %d\n", action); - } + ok( action == INSTALLSTATE_ABSENT, "Expected orion INSTALLSTATE_ABSENT, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: Don't install a feature that is disabled.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: c855fbfcd8fbcb2b19670b92f30af93a124baabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c855fbfcd8fbcb2b19670b92f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 25 00:06:43 2008 -0500 msi: Don't install a feature that is disabled. --- dlls/msi/action.c | 27 ++++++++++++++++----------- dlls/msi/tests/package.c | 14 ++++---------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8599520..f165109 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1735,10 +1735,11 @@ static void ACTION_GetFeatureInstallStates(MSIPACKAGE *package) } } -static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, - INSTALLSTATE state) +static BOOL process_state_property(MSIPACKAGE* package, int level, + LPCWSTR property, INSTALLSTATE state) { static const WCHAR all[]={'A','L','L',0}; + static const WCHAR remove[] = {'R','E','M','O','V','E',0}; LPWSTR override; MSIFEATURE *feature; @@ -1748,6 +1749,10 @@ static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { + if (lstrcmpW(property, remove) && + (feature->Level <= 0 || feature->Level > level)) + continue; + if (strcmpiW(override,all)==0) msi_feature_set_state( feature, state ); else @@ -1760,7 +1765,7 @@ static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, if ((ptr2 && strncmpW(ptr,feature->Feature, ptr2-ptr)==0) || (!ptr2 && strcmpW(ptr,feature->Feature)==0)) { - msi_feature_set_state( feature, state ); + msi_feature_set_state(feature, state); break; } if (ptr2) @@ -1780,7 +1785,7 @@ static BOOL process_state_property (MSIPACKAGE* package, LPCWSTR property, UINT MSI_SetFeatureStates(MSIPACKAGE *package) { - int install_level; + int level; static const WCHAR szlevel[] = {'I','N','S','T','A','L','L','L','E','V','E','L',0}; static const WCHAR szAddLocal[] = @@ -1800,7 +1805,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) TRACE("Checking Install Level\n"); - install_level = msi_get_property_int( package, szlevel, 1 ); + level = msi_get_property_int(package, szlevel, 1); /* ok here is the _real_ rub * all these activation/deactivation things happen in order and things @@ -1821,17 +1826,17 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) * REMOVE are the big ones, since we don't handle administrative installs * yet anyway. */ - override |= process_state_property(package,szAddLocal,INSTALLSTATE_LOCAL); - override |= process_state_property(package,szRemove,INSTALLSTATE_ABSENT); - override |= process_state_property(package,szAddSource,INSTALLSTATE_SOURCE); - override |= process_state_property(package,szReinstall,INSTALLSTATE_LOCAL); + override |= process_state_property(package, level, szAddLocal, INSTALLSTATE_LOCAL); + override |= process_state_property(package, level, szRemove, INSTALLSTATE_ABSENT); + override |= process_state_property(package, level, szAddSource, INSTALLSTATE_SOURCE); + override |= process_state_property(package, level, szReinstall, INSTALLSTATE_LOCAL); if (!override) { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { BOOL feature_state = ((feature->Level > 0) && - (feature->Level <= install_level)); + (feature->Level <= level)); if ((feature_state) && (feature->Action == INSTALLSTATE_UNKNOWN)) { @@ -1849,7 +1854,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { FeatureList *fl; - if (feature->Level > 0 && feature->Level <= install_level) + if (feature->Level > 0 && feature->Level <= level) continue; LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d74c50f..ab34e81 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4481,11 +4481,8 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5213,11 +5210,8 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: Fix the logic to determine the appropriate action of the feature.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 3807a917390b7152fe40f77a81a0f4244cb9fcd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3807a917390b7152fe40f77a8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 25 00:04:55 2008 -0500 msi: Fix the logic to determine the appropriate action of the feature. --- dlls/msi/msipriv.h | 38 ++++++++++++++++++++++++++++++++++++-- dlls/msi/tests/package.c | 25 ++++++++----------------- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dac4d9b..ec3a650 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -855,8 +855,42 @@ extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT sc static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state ) { - feature->ActionRequest = state; - feature->Action = state; + if (state == INSTALLSTATE_ABSENT) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + break; + default: + feature->ActionRequest = state; + feature->Action = state; + } + } + else if (state == INSTALLSTATE_SOURCE) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + case INSTALLSTATE_SOURCE: + feature->ActionRequest = state; + feature->Action = state; + break; + case INSTALLSTATE_LOCAL: + feature->ActionRequest = INSTALLSTATE_LOCAL; + feature->Action = INSTALLSTATE_LOCAL; + break; + default: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + } + } + else + { + feature->ActionRequest = state; + feature->Action = state; + } } static inline void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE state ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 88105fd..2036e9d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3027,20 +3027,14 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -3766,20 +3760,14 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5974,7 +5962,10 @@ static void test_featureparents(void) r = MsiGetFeatureState(hpkg, "orion", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected orion INSTALLSTATE_ABSENT, got %d\n", state); - ok( action == INSTALLSTATE_ABSENT, "Expected orion INSTALLSTATE_ABSENT, got %d\n", action); + todo_wine + { + ok( action == INSTALLSTATE_ABSENT, "Expected orion INSTALLSTATE_ABSENT, got %d\n", action); + } state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: Only set the action to source if the component has a local feature.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 9288055beb890629a89273d8afb71366be8099f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9288055beb890629a89273d8a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 25 00:06:09 2008 -0500 msi: Only set the action to source if the component has a local feature. --- dlls/msi/msipriv.h | 19 +++++++++-------- dlls/msi/tests/package.c | 50 +++++++++------------------------------------ 2 files changed, 20 insertions(+), 49 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ec3a650..e6ce9da 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -33,6 +33,7 @@ #include "objidl.h" #include "winnls.h" #include "wine/list.h" +#include "wine/debug.h" #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 @@ -912,16 +913,16 @@ static inline void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE sta } else if (state == INSTALLSTATE_SOURCE) { - switch (comp->Installed) + if (comp->Installed == INSTALLSTATE_ABSENT || + (comp->Installed == INSTALLSTATE_SOURCE && comp->hasLocalFeature)) { - case INSTALLSTATE_ABSENT: - case INSTALLSTATE_SOURCE: - comp->ActionRequest = state; - comp->Action = state; - break; - default: - comp->ActionRequest = INSTALLSTATE_UNKNOWN; - comp->Action = INSTALLSTATE_UNKNOWN; + comp->ActionRequest = state; + comp->Action = state; + } + else + { + comp->ActionRequest = INSTALLSTATE_UNKNOWN; + comp->Action = INSTALLSTATE_UNKNOWN; } } else diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 2036e9d..d74c50f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3809,20 +3809,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "epsilon", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "zeta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5251,20 +5245,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "beta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "gamma", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5285,20 +5273,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "epsilon", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "zeta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5333,20 +5315,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "mu", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "nu", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -5367,20 +5343,14 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "pi", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "rho", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

Jacek Caban : mshtml: Added IHTMLDocument::get_Script implementation.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 480087666d5db11367819ff85fbb2aa874df338f URL: http://source.winehq.org/git/wine.git/?a=commit;h=480087666d5db11367819ff85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 25 10:08:40 2008 +0200 mshtml: Added IHTMLDocument::get_Script implementation. --- dlls/mshtml/htmldoc.c | 8 ++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b1f063f..e5870d8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -252,8 +252,12 @@ static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMe static HRESULT WINAPI HTMLDocument_get_Script(IHTMLDocument2 *iface, IDispatch **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = (IDispatch*)HTMLWINDOW2(This->window); + IDispatch_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e7a2907..7e8c9bf 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2026,6 +2026,7 @@ static void test_window(IHTMLDocument2 *doc) { IHTMLWindow2 *window, *window2, *self; IHTMLDocument2 *doc2 = NULL; + IDispatch *disp; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -2052,6 +2053,12 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow2_Release(window2); IHTMLWindow2_Release(self); + disp = NULL; + hres = IHTMLDocument2_get_Script(doc, &disp); + ok(hres == S_OK, "get_Script failed: %08x\n", hres); + ok(disp == (void*)window, "disp != window\n"); + IDispatch_Release(disp); + IHTMLWindow2_Release(window); }

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_parentElement implementation.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: ad156168d170c5119c1e62c398a91dcf84c0516a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad156168d170c5119c1e62c39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 25 10:09:24 2008 +0200 mshtml: Added IHTMLElement::get_parentElement implementation. --- dlls/mshtml/htmlelem.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 27 ++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3aa5f29..a2e3439 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -382,8 +382,21 @@ static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_get_parentElement(IHTMLElement *iface, IHTMLElement **p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLDOMNode *node; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = IHTMLDOMNode_get_parentNode(HTMLDOMNODE(&This->node), &node); + if(FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement, (void**)p); + IHTMLDOMNode_Release(node); + if(FAILED(hres)) + *p = NULL; + + return S_OK; } static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7e8c9bf..d442800 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -971,6 +971,20 @@ static long _get_node_type(unsigned line, IUnknown *unk) return type; } +#define test_elem_get_parent(u) _test_elem_get_parent(__LINE__,u) +static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + IHTMLElement *parent; + HRESULT hres; + + hres = IHTMLElement_get_parentElement(elem, &parent); + IHTMLElement_Release(elem); + ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08x\n", hres); + + return parent; +} + #define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u) static long _elem_get_scroll_height(unsigned line, IUnknown *unk) { @@ -2209,7 +2223,7 @@ static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; IHTMLDOMChildrenCollection *child_col; - IHTMLElement *elem; + IHTMLElement *elem, *elem2, *elem3; IHTMLDOMNode *node, *node2; IDispatch *disp; long type; @@ -2299,6 +2313,17 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); ok(node2 == NULL, "node != NULL\n"); + elem2 = test_elem_get_parent((IUnknown*)elem); + ok(elem2 != NULL, "elem2 == NULL\n"); + test_node_name((IUnknown*)elem2, "BODY"); + elem3 = test_elem_get_parent((IUnknown*)elem2); + IHTMLElement_Release(elem2); + ok(elem3 != NULL, "elem3 == NULL\n"); + test_node_name((IUnknown*)elem3, "HTML"); + elem2 = test_elem_get_parent((IUnknown*)elem3); + IHTMLElement_Release(elem3); + ok(elem2 == NULL, "elem2 != NULL\n"); + test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2); test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0); test_elem_getelembytag((IUnknown*)elem, ET_HTML, 0);

1 0

James Hawkins : msi: Handle features installed as source in MsiQueryFeatureState.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 63064f7a4590091781d8ec5f148372bf50fef490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63064f7a4590091781d8ec5f1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 25 00:04:18 2008 -0500 msi: Handle features installed as source in MsiQueryFeatureState. --- dlls/msi/msi.c | 10 ++++++++ dlls/msi/tests/msi.c | 29 +++++++++++++++++++++++ dlls/msi/tests/package.c | 58 +++++++++++---------------------------------- 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f86f194..72f6966 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1905,6 +1905,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) INSTALLSTATE r; BOOL missing = FALSE; BOOL machine = FALSE; + BOOL source = FALSE; TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szFeature)); @@ -1978,6 +1979,12 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) path = msi_reg_get_val_str(hkey, squishProduct); if (!path) missing = TRUE; + else if (lstrlenW(path) > 2 && + path[0] >= '0' && path[0] <= '9' && + path[1] >= '0' && path[1] <= '9') + { + source = TRUE; + } msi_free(path); } @@ -1988,6 +1995,9 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) if (missing) return INSTALLSTATE_ADVERTISED; + if (source) + return INSTALLSTATE_SOURCE; + return INSTALLSTATE_LOCAL; } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index bafcddc..2b00314 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -920,6 +920,35 @@ static void test_MsiQueryFeatureState(void) res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + /* INSTALLSTATE_LOCAL */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01\\", 4); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLSTATE_SOURCE */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* bad INSTALLSTATE_SOURCE */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01a", 4); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLSTATE_SOURCE */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* bad INSTALLSTATE_SOURCE */ state = MsiQueryFeatureStateA(prodcode, "feature"); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c68d429..88105fd 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3730,20 +3730,14 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; @@ -4477,20 +4471,14 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; @@ -4521,20 +4509,14 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; @@ -5221,21 +5203,15 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee; @@ -5265,21 +5241,15 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "six", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "seven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - } + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee;

1 0

Paul Vriens : advapi32/tests: Fix a crash.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 60f3e577c2365ae86fda6dddcd61a7b797f1bd1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f3e577c2365ae86fda6dddc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 25 08:30:56 2008 +0200 advapi32/tests: Fix a crash. --- dlls/advapi32/tests/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4e574b6..55f3040 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1566,7 +1566,7 @@ static void test_enum_svc(void) NULL, 0, &needed, &returned, NULL, NULL); exservices = HeapAlloc(GetProcessHeap(), 0, needed); pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_ACTIVE, - (BYTE*)exservices, bufsize, &needed, &returned, NULL, NULL); + (BYTE*)exservices, needed, &needed, &returned, NULL, NULL); HeapFree(GetProcessHeap(), 0, exservices); /* Store the number of active driver services */

1 0

Paul Vriens : advapi32/tests: Remove duplicate test.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 10217fae299db3bf3dbce66de3dc0807c8c57322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10217fae299db3bf3dbce66de… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Aug 24 17:50:28 2008 +0200 advapi32/tests: Remove duplicate test. --- dlls/advapi32/tests/service.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4225e35..4e574b6 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1239,18 +1239,6 @@ static void test_enum_svc(void) ok(returned == (servicecountactive + servicecountinactive), "Something wrong in the calculation\n"); - /* Get the number of all services */ - EnumServicesStatusA(scm_handle, SERVICE_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, - NULL, 0, &needed, &returned, NULL); - services = HeapAlloc(GetProcessHeap(), 0, needed); - EnumServicesStatusA(scm_handle, SERVICE_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, - services, needed, &needed, &returned, NULL); - - /* Check if total is the same as active and inactive win32 services */ - todo_wine - ok(returned == (servicecountactive + servicecountinactive), - "Something wrong in the calculation\n"); - /* Get the number of all services. * Fetch the status of the last call as failing could make the following tests crash * on Wine (we don't return anything yet).

1 0