October 2006 - Wine-Commits

Mike McCormack : msi: Update tables using records, not integer by integer.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 15bfb30fc3beaee28cf4008b982b90fa33b6f130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bfb30fc3beaee28cf4008b9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 17:09:47 2006 +0900 msi: Update tables using records, not integer by integer. --- dlls/msi/delete.c | 16 +++++-- dlls/msi/msipriv.h | 4 +- dlls/msi/select.c | 41 ++++++++++++++++---- dlls/msi/table.c | 106 ++++++++++++++++++++++++++++++--------------------- dlls/msi/update.c | 39 +++---------------- dlls/msi/where.c | 14 +++--- 6 files changed, 122 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15bfb30fc3beaee28cf40…

1 0

Mike McCormack : msi: Remove some unused functions.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 9b95c27c9c4aee02e45e81756904006b759d4b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b95c27c9c4aee02e45e81756… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 17:08:43 2006 +0900 msi: Remove some unused functions. --- dlls/msi/alter.c | 22 ++-------------------- dlls/msi/delete.c | 22 ++-------------------- dlls/msi/join.c | 22 ++-------------------- 3 files changed, 6 insertions(+), 60 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 396354c..24a11ab 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -58,24 +58,6 @@ static UINT ALTER_fetch_stream( struct t return ERROR_FUNCTION_FAILED; } -static UINT ALTER_set_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT val ) -{ - MSIALTERVIEW *av = (MSIALTERVIEW*)view; - - TRACE("%p %d %d %04x\n", av, row, col, val ); - - return ERROR_FUNCTION_FAILED; -} - -static UINT ALTER_insert_row( struct tagMSIVIEW *view, MSIRECORD *record ) -{ - MSIALTERVIEW *av = (MSIALTERVIEW*)view; - - TRACE("%p %p\n", av, record ); - - return ERROR_FUNCTION_FAILED; -} - static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIALTERVIEW *av = (MSIALTERVIEW*)view; @@ -146,8 +128,8 @@ static const MSIVIEWOPS alter_ops = { ALTER_fetch_int, ALTER_fetch_stream, - ALTER_set_int, - ALTER_insert_row, + NULL, + NULL, ALTER_execute, ALTER_close, ALTER_get_dimensions, diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 6a9d62a..3e8d694 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -73,24 +73,6 @@ static UINT DELETE_fetch_stream( struct return ERROR_FUNCTION_FAILED; } -static UINT DELETE_set_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT val ) -{ - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; - - TRACE("%p %d %d %04x\n", dv, row, col, val ); - - return ERROR_FUNCTION_FAILED; -} - -static UINT DELETE_insert_row( struct tagMSIVIEW *view, MSIRECORD *record ) -{ - MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; - - TRACE("%p %p\n", dv, record ); - - return ERROR_FUNCTION_FAILED; -} - static UINT DELETE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; @@ -195,8 +177,8 @@ static const MSIVIEWOPS delete_ops = { DELETE_fetch_int, DELETE_fetch_stream, - DELETE_set_int, - DELETE_insert_row, + NULL, + NULL, DELETE_execute, DELETE_close, DELETE_get_dimensions, diff --git a/dlls/msi/join.c b/dlls/msi/join.c index fda6b1b..3462521 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -103,24 +103,6 @@ static UINT JOIN_fetch_stream( struct ta return table->ops->fetch_stream( table, row, col, stm ); } -static UINT JOIN_set_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT val ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - - TRACE("%p %d %d %04x\n", jv, row, col, val ); - - return ERROR_FUNCTION_FAILED; -} - -static UINT JOIN_insert_row( struct tagMSIVIEW *view, MSIRECORD *record ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - - TRACE("%p %p\n", jv, record ); - - return ERROR_FUNCTION_FAILED; -} - static int join_key_compare(const void *l, const void *r) { const UINT *left = l, *right = r; @@ -345,8 +327,8 @@ static const MSIVIEWOPS join_ops = { JOIN_fetch_int, JOIN_fetch_stream, - JOIN_set_int, - JOIN_insert_row, + NULL, + NULL, JOIN_execute, JOIN_close, JOIN_get_dimensions,

1 0

Mike McCormack : msi: Fixed the UPDATE query to work with explicit values.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 4a32845a569d78b047d3ee2cd35239df25a254ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a32845a569d78b047d3ee2cd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 14:08:38 2006 +0900 msi: Fixed the UPDATE query to work with explicit values. --- dlls/msi/insert.c | 6 +++--- dlls/msi/query.h | 2 ++ dlls/msi/tests/db.c | 42 ++++++++++++------------------------------ dlls/msi/update.c | 25 ++++++++++++++++++------- 4 files changed, 35 insertions(+), 40 deletions(-) diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index 33c915f..aefc8fc 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -57,12 +57,12 @@ static UINT INSERT_fetch_int( struct tag } /* - * INSERT_merge_record + * msi_query_merge_record * * Merge a value_list and a record to create a second record. * Replace wildcard entries in the valuelist with values from the record */ -static MSIRECORD *INSERT_merge_record( UINT fields, column_info *vl, MSIRECORD *rec ) +MSIRECORD *msi_query_merge_record( UINT fields, column_info *vl, MSIRECORD *rec ) { MSIRECORD *merged; DWORD wildcard_count = 1, i; @@ -128,7 +128,7 @@ static UINT INSERT_execute( struct tagMS * Merge the wildcard values into the list of values provided * in the query, and create a record containing both. */ - values = INSERT_merge_record( col_count, iv->vals, record ); + values = msi_query_merge_record( col_count, iv->vals, record ); if( !values ) goto err; diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 16aeb66..b15a61e 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -125,4 +125,6 @@ UINT ALTER_CreateView( MSIDATABASE *db, int sqliteGetToken(const WCHAR *z, int *tokenType); +MSIRECORD *msi_query_merge_record( UINT fields, column_info *vl, MSIRECORD *rec ); + #endif /* __WINE_MSI_QUERY_H */ diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 761b9f9..b9ffaa7 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3003,13 +3003,10 @@ static void test_update(void) query = "UPDATE `Control` SET `Text` = 'this is text' WHERE `Dialog_` = 'ErrorDialog'"; r = MsiDatabaseOpenView(hdb, query, &view); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - r = MsiViewExecute(view, 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - r = MsiViewClose(view); - ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); - } + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewClose(view); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); r = MsiCloseHandle(view); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); @@ -3026,10 +3023,7 @@ static void test_update(void) size = MAX_PATH; r = MsiRecordGetString(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); - } + ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); MsiCloseHandle(rec); @@ -3055,13 +3049,10 @@ static void test_update(void) query = "UPDATE `Control` SET `Text` = 'this is text' WHERE `Dialog_` = 'ErrorDialog' AND `Control` = 'ErrorText'"; r = MsiDatabaseOpenView(hdb, query, &view); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); - todo_wine - { - r = MsiViewExecute(view, 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - r = MsiViewClose(view); - ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); - } + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewClose(view); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); r = MsiCloseHandle(view); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); @@ -3078,10 +3069,7 @@ static void test_update(void) size = MAX_PATH; r = MsiRecordGetString(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); - } + ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); MsiCloseHandle(rec); @@ -3130,10 +3118,7 @@ static void test_update(void) size = MAX_PATH; r = MsiRecordGetString(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); - } + ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); MsiCloseHandle(rec); @@ -3143,10 +3128,7 @@ static void test_update(void) size = MAX_PATH; r = MsiRecordGetString(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); - } + ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); MsiCloseHandle(rec); diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 9cbe55a..c97d9e8 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -59,13 +59,11 @@ static UINT UPDATE_execute( struct tagMS { MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; UINT n, type, val, r, row, col_count = 0, row_count = 0; + MSIRECORD *values = NULL; MSIVIEW *wv; TRACE("%p %p\n", uv, record ); - if( !record ) - return ERROR_FUNCTION_FAILED; - wv = uv->wv; if( !wv ) return ERROR_FUNCTION_FAILED; @@ -79,6 +77,10 @@ static UINT UPDATE_execute( struct tagMS if( r ) goto err; + values = msi_query_merge_record( col_count, uv->vals, record ); + if (!values) + return ERROR_FUNCTION_FAILED; + for( row = 0; row < row_count; row++ ) { for( n = 1; n <= col_count; n++ ) @@ -87,15 +89,22 @@ static UINT UPDATE_execute( struct tagMS if( r ) break; - if( type & MSITYPE_STRING ) + if( MSI_RecordIsNull( values, n )) + val = 0; + else if( type & MSITYPE_STRING ) { - const WCHAR *str = MSI_RecordGetString( record, n ); + const WCHAR *str = MSI_RecordGetString( values, n ); val = msi_addstringW( uv->db->strings, 0, str, -1, 1 ); } + else if ((type & 0xff) == 2) + { + val = MSI_RecordGetInteger( values, n ); + val ^= 0x8000; + } else { - val = MSI_RecordGetInteger( record, n ); - val |= 0x8000; + val = MSI_RecordGetInteger( values, n ); + val ^= 0x80000000; } r = wv->ops->set_int( wv, row, n, val ); if( r ) @@ -103,6 +112,8 @@ static UINT UPDATE_execute( struct tagMS } } + msiobj_release( &values->hdr ); + err: return ERROR_SUCCESS; }

1 0

Mike McCormack : msi: Use msi_feature_set_state and msi_component_set_state where possible.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 575cc67d0fa56855e8b7460f85ba83b41538160c URL: http://source.winehq.org/git/wine.git/?a=commit;h=575cc67d0fa56855e8b7460f8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 14:09:29 2006 +0900 msi: Use msi_feature_set_state and msi_component_set_state where possible. --- dlls/msi/action.c | 28 +++++----------------------- dlls/msi/dialog.c | 3 +-- dlls/msi/events.c | 17 +++++------------ dlls/msi/helpers.c | 28 ++++++---------------------- dlls/msi/install.c | 3 +-- dlls/msi/msipriv.h | 12 ++++++++++++ 6 files changed, 30 insertions(+), 61 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3000ca0..161a2d6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1150,8 +1150,7 @@ static UINT load_component( MSIRECORD *r comp->KeyPath = msi_dup_record_field( row, 6 ); comp->Installed = INSTALLSTATE_UNKNOWN; - comp->Action = INSTALLSTATE_UNKNOWN; - comp->ActionRequest = INSTALLSTATE_UNKNOWN; + msi_component_set_state( comp, INSTALLSTATE_UNKNOWN ); return ERROR_SUCCESS; } @@ -1282,8 +1281,7 @@ static UINT load_feature(MSIRECORD * row feature->Attributes = MSI_RecordGetInteger(row,8); feature->Installed = INSTALLSTATE_UNKNOWN; - feature->Action = INSTALLSTATE_UNKNOWN; - feature->ActionRequest = INSTALLSTATE_UNKNOWN; + msi_feature_set_state( feature, INSTALLSTATE_UNKNOWN ); list_add_tail( &package->features, &feature->entry ); @@ -1665,14 +1663,11 @@ static BOOL process_state_property (MSIP override = msi_dup_property( package, property ); if (!override) return FALSE; - + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { if (strcmpiW(override,all)==0) - { - feature->ActionRequest= state; - feature->Action = state; - } + msi_feature_set_state( feature, state ); else { LPWSTR ptr = override; @@ -1683,8 +1678,7 @@ static BOOL process_state_property (MSIP if ((ptr2 && strncmpW(ptr,feature->Feature, ptr2-ptr)==0) || (!ptr2 && strcmpW(ptr,feature->Feature)==0)) { - feature->ActionRequest= state; - feature->Action = state; + msi_feature_set_state( feature, state ); break; } if (ptr2) @@ -1702,18 +1696,6 @@ static BOOL process_state_property (MSIP return TRUE; } -static void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state ) -{ - feature->ActionRequest = state; - feature->Action = state; -} - -static void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE state ) -{ - comp->ActionRequest = state; - comp->Action = state; -} - UINT MSI_SetFeatureStates(MSIPACKAGE *package) { int install_level; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 422f0c5..403e65f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1766,8 +1766,7 @@ msi_seltree_menu( HWND hwnd, HTREEITEM h case INSTALLSTATE_LOCAL: case INSTALLSTATE_ADVERTISED: case INSTALLSTATE_ABSENT: - feature->ActionRequest = r; - feature->Action = r; + msi_feature_set_state( feature, r ); break; default: FIXME("select feature and all children\n"); diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 2b0397b..13805a6 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -185,10 +185,8 @@ static UINT ControlEvent_AddLocal(MSIPAC else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - feature->ActionRequest = INSTALLSTATE_LOCAL; - feature->Action = INSTALLSTATE_LOCAL; - } + msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + ACTION_UpdateComponentStates(package,argument); } return ERROR_SUCCESS; @@ -207,10 +205,8 @@ static UINT ControlEvent_Remove(MSIPACKA else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - feature->ActionRequest = INSTALLSTATE_ABSENT; - feature->Action= INSTALLSTATE_ABSENT; - } + msi_feature_set_state( feature, INSTALLSTATE_ABSENT ); + ACTION_UpdateComponentStates(package,argument); } return ERROR_SUCCESS; @@ -229,10 +225,7 @@ static UINT ControlEvent_AddSource(MSIPA else { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - feature->ActionRequest = INSTALLSTATE_SOURCE; - feature->Action = INSTALLSTATE_SOURCE; - } + msi_feature_set_state( feature, INSTALLSTATE_SOURCE ); ACTION_UpdateComponentStates(package,argument); } return ERROR_SUCCESS; diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index bb4dcc4..83a9f30 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -865,17 +865,13 @@ void ACTION_UpdateComponentStates(MSIPAC continue; if (newstate == INSTALLSTATE_LOCAL) - { - component->ActionRequest = INSTALLSTATE_LOCAL; - component->Action = INSTALLSTATE_LOCAL; - } + msi_component_set_state( component, INSTALLSTATE_LOCAL ); else { ComponentList *clist; MSIFEATURE *f; - component->ActionRequest = newstate; - component->Action = newstate; + msi_component_set_state( component, newstate ); /*if any other feature wants is local we need to set it local*/ LIST_FOR_EACH_ENTRY( f, &package->features, MSIFEATURE, entry ) @@ -897,26 +893,14 @@ void ACTION_UpdateComponentStates(MSIPAC if (component->Attributes & msidbComponentAttributesOptional) { if (f->Attributes & msidbFeatureAttributesFavorSource) - { - component->Action = INSTALLSTATE_SOURCE; - component->ActionRequest = INSTALLSTATE_SOURCE; - } + msi_component_set_state( component, INSTALLSTATE_SOURCE ); else - { - component->Action = INSTALLSTATE_LOCAL; - component->ActionRequest = INSTALLSTATE_LOCAL; - } + msi_component_set_state( component, INSTALLSTATE_LOCAL ); } else if (component->Attributes & msidbComponentAttributesSourceOnly) - { - component->Action = INSTALLSTATE_SOURCE; - component->ActionRequest = INSTALLSTATE_SOURCE; - } + msi_component_set_state( component, INSTALLSTATE_SOURCE ); else - { - component->Action = INSTALLSTATE_LOCAL; - component->ActionRequest = INSTALLSTATE_LOCAL; - } + msi_component_set_state( component, INSTALLSTATE_LOCAL ); } } } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 7a367aa..fdec30c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -539,8 +539,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACK feature->Attributes & msidbFeatureAttributesDisallowAdvertise) return ERROR_FUNCTION_FAILED; - feature->ActionRequest = iState; - feature->Action = iState; + msi_feature_set_state( feature, iState ); ACTION_UpdateComponentStates(package,szFeature); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5acdd25..cdb95c4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -713,6 +713,18 @@ extern UINT ACTION_PerformUIAction(MSIPA extern void ACTION_FinishCustomActions( MSIPACKAGE* package); extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, BOOL execute); +static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state ) +{ + feature->ActionRequest = state; + feature->Action = state; +} + +static inline void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE state ) +{ + comp->ActionRequest = state; + comp->Action = state; +} + /* actions in other modules */ extern UINT ACTION_AppSearch(MSIPACKAGE *package); extern UINT ACTION_FindRelatedProducts(MSIPACKAGE *package);

1 0

Mike McCormack : msi: Create macro functions to set feature and component states.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 6395ff6a5c20f9fc4702279b9c356b695de3a312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6395ff6a5c20f9fc4702279b9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 12:34:52 2006 +0900 msi: Create macro functions to set feature and component states. --- dlls/msi/action.c | 135 ++++++++++++++++++++--------------------------------- 1 files changed, 51 insertions(+), 84 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 84275f9..3000ca0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1696,12 +1696,24 @@ static BOOL process_state_property (MSIP break; } } - } + } msi_free(override); return TRUE; } +static void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state ) +{ + feature->ActionRequest = state; + feature->Action = state; +} + +static void msi_component_set_state( MSICOMPONENT *comp, INSTALLSTATE state ) +{ + comp->ActionRequest = state; + comp->Action = state; +} + UINT MSI_SetFeatureStates(MSIPACKAGE *package) { int install_level; @@ -1740,7 +1752,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa * 11) FILEADDDEFAULT * I have confirmed that if ADDLOCAL is stated then the INSTALLLEVEL is * ignored for all the features. seems strange, especially since it is not - * documented anywhere, but it is how it works. + * documented anywhere, but it is how it works. * * I am still ignoring a lot of these. But that is ok for now, ADDLOCAL and * REMOVE are the big ones, since we don't handle administrative installs @@ -1760,20 +1772,11 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa if ((feature_state) && (feature->Action == INSTALLSTATE_UNKNOWN)) { if (feature->Attributes & msidbFeatureAttributesFavorSource) - { - feature->ActionRequest = INSTALLSTATE_SOURCE; - feature->Action = INSTALLSTATE_SOURCE; - } + msi_feature_set_state( feature, INSTALLSTATE_SOURCE ); else if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) - { - feature->ActionRequest = INSTALLSTATE_ADVERTISED; - feature->Action = INSTALLSTATE_ADVERTISED; - } + msi_feature_set_state( feature, INSTALLSTATE_ADVERTISED ); else - { - feature->ActionRequest = INSTALLSTATE_LOCAL; - feature->Action = INSTALLSTATE_LOCAL; - } + msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); } } @@ -1786,10 +1789,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa continue; LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - { - fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; - fl->feature->Action = INSTALLSTATE_UNKNOWN; - } + msi_feature_set_state( fl->feature, INSTALLSTATE_UNKNOWN ); } } else @@ -1802,8 +1802,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa } /* - * now we want to enable or disable components base on feature - */ + * now we want to enable or disable components base on feature + */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { @@ -1820,92 +1820,59 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa switch (component->Attributes) { case msidbComponentAttributesLocalOnly: - component->Action = INSTALLSTATE_LOCAL; - component->ActionRequest = INSTALLSTATE_LOCAL; + msi_component_set_state( component, INSTALLSTATE_LOCAL ); break; case msidbComponentAttributesSourceOnly: - component->Action = INSTALLSTATE_SOURCE; - component->ActionRequest = INSTALLSTATE_SOURCE; + msi_component_set_state( component, INSTALLSTATE_SOURCE ); break; case msidbComponentAttributesOptional: - component->Action = INSTALLSTATE_DEFAULT; - component->ActionRequest = INSTALLSTATE_DEFAULT; + msi_component_set_state( component, INSTALLSTATE_DEFAULT ); break; default: - component->Action = INSTALLSTATE_LOCAL; - component->ActionRequest = INSTALLSTATE_LOCAL; + msi_component_set_state( component, INSTALLSTATE_LOCAL ); } if (component->ForceLocalState) - { - component->Action = INSTALLSTATE_LOCAL; - component->ActionRequest = INSTALLSTATE_LOCAL; - } + msi_component_set_state( component, INSTALLSTATE_LOCAL ); if (!component->Enabled) + msi_component_set_state( component, INSTALLSTATE_UNKNOWN ); + else if (feature->Attributes == msidbFeatureAttributesFavorLocal) { - component->Action = INSTALLSTATE_UNKNOWN; - component->ActionRequest = INSTALLSTATE_UNKNOWN; + if (!(component->Attributes & msidbComponentAttributesSourceOnly)) + msi_component_set_state( component, INSTALLSTATE_LOCAL ); } - else + else if (feature->Attributes == msidbFeatureAttributesFavorSource) { - if (feature->Attributes == msidbFeatureAttributesFavorLocal) - { - if (!(component->Attributes & msidbComponentAttributesSourceOnly)) - { - component->Action = INSTALLSTATE_LOCAL; - component->ActionRequest = INSTALLSTATE_LOCAL; - } - } - else if (feature->Attributes == msidbFeatureAttributesFavorSource) - { - if ((component->Action == INSTALLSTATE_UNKNOWN) || - (component->Action == INSTALLSTATE_ABSENT) || - (component->Action == INSTALLSTATE_ADVERTISED) || - (component->Action == INSTALLSTATE_DEFAULT)) - - { - component->Action = INSTALLSTATE_SOURCE; - component->ActionRequest = INSTALLSTATE_SOURCE; - } - } - else if (feature->ActionRequest == INSTALLSTATE_ADVERTISED) - { - if ((component->Action == INSTALLSTATE_UNKNOWN) || - (component->Action == INSTALLSTATE_ABSENT)) - - { - component->Action = INSTALLSTATE_ADVERTISED; - component->ActionRequest = INSTALLSTATE_ADVERTISED; - } - } - else if (feature->ActionRequest == INSTALLSTATE_ABSENT) - { - if (component->Action == INSTALLSTATE_UNKNOWN) - { - component->Action = INSTALLSTATE_ABSENT; - component->ActionRequest = INSTALLSTATE_ABSENT; - } - } - else if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) - { - component->Action = INSTALLSTATE_UNKNOWN; - component->ActionRequest = INSTALLSTATE_UNKNOWN; - } + if ((component->Action == INSTALLSTATE_UNKNOWN) || + (component->Action == INSTALLSTATE_ABSENT) || + (component->Action == INSTALLSTATE_ADVERTISED) || + (component->Action == INSTALLSTATE_DEFAULT)) + msi_component_set_state( component, INSTALLSTATE_SOURCE ); } - - if (component->ForceLocalState && feature->Action == INSTALLSTATE_SOURCE) + else if (feature->ActionRequest == INSTALLSTATE_ADVERTISED) + { + if ((component->Action == INSTALLSTATE_UNKNOWN) || + (component->Action == INSTALLSTATE_ABSENT)) + msi_component_set_state( component, INSTALLSTATE_ADVERTISED ); + } + else if (feature->ActionRequest == INSTALLSTATE_ABSENT) { - feature->Action = INSTALLSTATE_LOCAL; - feature->ActionRequest = INSTALLSTATE_LOCAL; + if (component->Action == INSTALLSTATE_UNKNOWN) + msi_component_set_state( component, INSTALLSTATE_ABSENT ); } + else if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) + msi_component_set_state( component, INSTALLSTATE_UNKNOWN ); + + if (component->ForceLocalState && feature->Action == INSTALLSTATE_SOURCE) + msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); } - } + } LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) { TRACE("Result: Component %s (Installed %i, Action %i, Request %i)\n", - debugstr_w(component->Component), component->Installed, + debugstr_w(component->Component), component->Installed, component->Action, component->ActionRequest); }

1 0

James Hawkins : msi: Add tests for the UPDATE sql command.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 62aedea856037208e93e36dcc5b7e6cc737b62e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62aedea856037208e93e36dcc… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 25 19:37:20 2006 -0700 msi: Add tests for the UPDATE sql command. --- dlls/msi/tests/db.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 262 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62aedea856037208e93e3…

1 0

Mikołaj Zalewski : comdlg32: Select the Filename edit box content after the user navigated to a directory by entering there the name .
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 7f86e6b849a7e68a9dc074a1f4e704a53c0f3c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f86e6b849a7e68a9dc074a1f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 25 22:00:35 2006 +0200 comdlg32: Select the Filename edit box content after the user navigated to a directory by entering there the name. --- dlls/comdlg32/filedlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 1243d41..5410bf9 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2021,6 +2021,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) IShellView_Refresh(fodInfos->Shell.FOIShellView); } COMDLG32_SHFree(pidlCurrent); + SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); } } ret = FALSE;

1 0

Hwang YunSong(황윤성) : kernel32: Added winerr_kor.mc.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: ca2160acba66ac5b79f4b515abf1352e74220f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2160acba66ac5b79f4b515a… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 24 16:15:30 2006 +0900 kernel32: Added winerr_kor.mc. --- dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/kernel.rc | 1 + dlls/kernel32/nls/winerr_kor.mc | 3731 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3734 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca2160acba66ac5b79f4b…

1 0

Rob Shearman : rpcrt4: Move transport-specific server functions to rpc_transport.c.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: c3918d9be4ee62cd7bacef4e91d86cb31193ec2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3918d9be4ee62cd7bacef4e9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 25 13:28:56 2006 +0100 rpcrt4: Move transport-specific server functions to rpc_transport.c. --- dlls/rpcrt4/rpc_server.c | 150 +------------------------------------- dlls/rpcrt4/rpc_server.h | 3 + dlls/rpcrt4/rpc_transport.c | 172 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 165 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3918d9be4ee62cd7bace…

1 0

Oleg Krylov : comctl32: Create tooltip windows with WS_POPUP style.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: 32caf30f9c5c326c098f66f59f2a0c792ecf7475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32caf30f9c5c326c098f66f59… Author: Oleg Krylov <oleg.krylov(a)gmail.com> Date: Wed Oct 25 13:31:44 2006 +0300 comctl32: Create tooltip windows with WS_POPUP style. --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/trackbar.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 2925cc2..2f08f75 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1336,7 +1336,7 @@ COMCTL32_CreateToolTip(HWND hwndOwner) { HWND hwndToolTip; - hwndToolTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + hwndToolTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwndOwner, 0, 0, 0); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index fb39d59..5ccc059 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3038,7 +3038,7 @@ static LRESULT TAB_Create (HWND hwnd, WP if (dwStyle & TCS_TOOLTIPS) { /* Create tooltip control */ infoPtr->hwndToolTip = - CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0, + CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwnd, 0, 0, 0); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 79efd7b..9b96f90 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1950,7 +1950,7 @@ TOOLBAR_TooltipCreateControl(TOOLBAR_INF int i; NMTOOLTIPSCREATED nmttc; - infoPtr->hwndToolTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + infoPtr->hwndToolTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, infoPtr->hwndSelf, 0, 0, 0); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 765a9ff..b61e64d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1415,7 +1415,7 @@ TRACKBAR_Create (HWND hwnd, LPCREATESTRU if (dwStyle & TBS_TOOLTIPS) { infoPtr->hwndToolTip = - CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0, + CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwnd, 0, 0, 0);

1 0