October 2009 - Wine-commits

Hib Eris : msi: Add function get_table_value_from_record.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: efacff81d692b070c2bc6268b95e02bcb1598244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efacff81d692b070c2bc6268b… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 14:29:02 2009 +0200 msi: Add function get_table_value_from_record. --- dlls/msi/table.c | 79 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 58 insertions(+), 21 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index aa37670..d787cb5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1368,6 +1368,48 @@ err: return r; } +static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT iField, UINT *pvalue ) +{ + MSICOLUMNINFO columninfo; + UINT r; + + if ( (iField <= 0) || + (iField > tv->num_cols) || + MSI_RecordIsNull( rec, iField ) ) + return ERROR_FUNCTION_FAILED; + + columninfo = tv->columns[ iField - 1 ]; + + if ( MSITYPE_IS_BINARY(columninfo.type) ) + { + *pvalue = 1; /* refers to the first key column */ + } + else if ( columninfo.type & MSITYPE_STRING ) + { + LPCWSTR sval = MSI_RecordGetString( rec, iField ); + + r = msi_string2idW(tv->db->strings, sval, pvalue); + if (r != ERROR_SUCCESS) + return ERROR_NOT_FOUND; + } + else if ( 2 == bytes_per_column( tv->db, &columninfo ) ) + { + *pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField ); + if ( *pvalue & 0xffff0000 ) + { + ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000); + return ERROR_FUNCTION_FAILED; + } + } + else + { + INT ival = MSI_RecordGetInteger( rec, iField ); + *pvalue = ival ^ 0x80000000; + } + + return ERROR_SUCCESS; +} + static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; @@ -1395,11 +1437,15 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI val = 0; if ( !MSI_RecordIsNull( rec, i + 1 ) ) { + r = get_table_value_from_record (tv, rec, i + 1, &val); if ( MSITYPE_IS_BINARY(tv->columns[ i ].type) ) { IStream *stm; LPWSTR stname; + if ( r != ERROR_SUCCESS ) + return ERROR_FUNCTION_FAILED; + r = MSI_RecordGetIStream( rec, i + 1, &stm ); if ( r != ERROR_SUCCESS ) return r; @@ -1417,38 +1463,29 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) return r; - - val = 1; /* refers to the first key column */ } else if ( tv->columns[i].type & MSITYPE_STRING ) { - LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - UINT ival, x; + UINT x; - r = msi_string2idW(tv->db->strings, sval, &ival); - if (r == ERROR_SUCCESS) + if ( r != ERROR_SUCCESS ) { - TABLE_fetch_int(&tv->view, row, i + 1, &x); - if (ival == x) - continue; - } + LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); + val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, + persistent ? StringPersistent : StringNonPersistent ); - val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, - persistent ? StringPersistent : StringNonPersistent ); - } - else if ( 2 == bytes_per_column( tv->db, &tv->columns[ i ] ) ) - { - val = 0x8000 + MSI_RecordGetInteger( rec, i + 1 ); - if ( val & 0xffff0000 ) + } + else { - ERR("field %u value %d out of range\n", i+1, val - 0x8000 ); - return ERROR_FUNCTION_FAILED; + TABLE_fetch_int(&tv->view, row, i + 1, &x); + if (val == x) + continue; } } else { - INT ival = MSI_RecordGetInteger( rec, i + 1 ); - val = ival ^ 0x80000000; + if ( r != ERROR_SUCCESS ) + return ERROR_FUNCTION_FAILED; } }

1 0

Hib Eris : msi: Fix table rows order.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: f6ae2507ef8038789923c9bf7142d3cd72c9526e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ae2507ef8038789923c9bf7… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 14:29:54 2009 +0200 msi: Fix table rows order. --- dlls/msi/table.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/db.c | 16 ++++++++-------- 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d787cb5..c567582 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1657,6 +1657,41 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec ) return ERROR_SUCCESS; } +static UINT find_insert_index( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *pidx ) +{ + UINT r, idx, j, ivalue, x; + + TRACE("%p %p %p\n", tv, rec, pidx); + + for (idx = 0; idx < tv->table->row_count; idx++) + { + for (j = 0; j < tv->num_cols; j++ ) + { + r = get_table_value_from_record (tv, rec, j+1, &ivalue); + if (r != ERROR_SUCCESS) + break; + + r = TABLE_fetch_int(&tv->view, idx, j + 1, &x); + if (r != ERROR_SUCCESS) + return r; + + if (ivalue > x) + break; + else if (ivalue == x) + continue; + else { + TRACE("Found %d.\n", idx); + *pidx = idx; + return ERROR_SUCCESS; + } + } + } + + TRACE("Found %d.\n", idx); + *pidx = idx; + return ERROR_SUCCESS; +} + static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; @@ -1669,6 +1704,13 @@ static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, if( r != ERROR_SUCCESS ) return ERROR_FUNCTION_FAILED; + if (row == -1) + { + r = find_insert_index(tv, rec, &row); + if( r != ERROR_SUCCESS ) + return ERROR_FUNCTION_FAILED; + } + r = table_create_new_row( view, &row, temporary ); TRACE("insert_row returned %08x\n", r); if( r != ERROR_SUCCESS ) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4bb0039..bfaba17 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4527,11 +4527,11 @@ static void test_rows_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); + ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 2, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "B"), "Expected B, got %s\n", buffer); + ok(!lstrcmp(buffer, "B"), "Expected B, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4540,11 +4540,11 @@ static void test_rows_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "C"), "Expected E, got %s\n", buffer); + ok(!lstrcmp(buffer, "C"), "Expected E, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 2, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); + ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4553,11 +4553,11 @@ static void test_rows_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "D"), "Expected D, got %s\n", buffer); + ok(!lstrcmp(buffer, "D"), "Expected D, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 2, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); + ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4566,11 +4566,11 @@ static void test_rows_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "F"), "Expected F, got %s\n", buffer); + ok(!lstrcmp(buffer, "F"), "Expected F, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 2, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); + ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0

Hib Eris : msi: Remove table_find_insert_idx().
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 47ec8ab0f3fcd66e0a9b8000b0826066a7bdca8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ec8ab0f3fcd66e0a9b8000b… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 14:30:46 2009 +0200 msi: Remove table_find_insert_idx(). The function table_find_insert_idx() is replaced by the more generic function find_insert_index(). --- dlls/msi/table.c | 40 ++-------------------------------------- 1 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c567582..35f7979 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -121,7 +121,6 @@ static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); -static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx); static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col ) { @@ -627,7 +626,6 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, column_info *col; MSITABLE *table; UINT i; - INT idx; /* only add tables that don't exist already */ if( TABLE_Exists(db, name ) ) @@ -693,11 +691,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( r ) goto err; - r = table_find_insert_idx (tv, name, &idx); - if (r != ERROR_SUCCESS) - idx = -1; - - r = tv->ops->insert_row( tv, rec, idx, persistent == MSICONDITION_FALSE ); + r = tv->ops->insert_row( tv, rec, -1, persistent == MSICONDITION_FALSE ); TRACE("insert_row returned %x\n", r); if( r ) goto err; @@ -747,11 +741,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( r ) goto err; - r = table_find_insert_idx (tv, name, &idx); - if (r != ERROR_SUCCESS) - idx = -1; - - r = tv->ops->insert_row( tv, rec, idx, FALSE ); + r = tv->ops->insert_row( tv, rec, -1, FALSE ); if( r ) goto err; @@ -3033,29 +3023,3 @@ void msi_free_transforms( MSIDATABASE *db ) msi_free( t ); } } - -static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx) -{ - UINT r, name_id, row_id; - INT idx; - MSITABLEVIEW *tv = (MSITABLEVIEW *)view; - - TRACE ("%p %s\n", view, debugstr_w(name)); - - r = msi_string2idW(tv->db->strings, name, &name_id); - if (r != ERROR_SUCCESS) - { - *pidx = -1; - return r; - } - - for( idx = 0; idx < tv->table->row_count; idx++ ) - { - r = TABLE_fetch_int( &tv->view, idx, 1, &row_id ); - if (row_id > name_id) - break; - } - - *pidx = idx; - return ERROR_SUCCESS; -}

1 0

Hib Eris : msi/tests: Add tests for rows order.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 925fb3b4088978c9c14f822e954d95d010ce0902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925fb3b4088978c9c14f822e9… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 14:27:25 2009 +0200 msi/tests: Add tests for rows order. --- dlls/msi/tests/db.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 20043d6..7013fa4 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4449,6 +4449,142 @@ static void test_tables_order(void) DeleteFile(msifile); } +static void test_rows_order(void) +{ + const char *query; + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + UINT r; + char buffer[100]; + DWORD sz; + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `foo` ( " + "`bar` LONGCHAR NOT NULL PRIMARY KEY `bar`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'A' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'B' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'C' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'D' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'E' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'F' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + query = "CREATE TABLE `bar` ( " + "`foo` LONGCHAR NOT NULL, " + "`baz` LONGCHAR NOT NULL " + "PRIMARY KEY `foo` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'C', 'E' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'F', 'A' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'A', 'B' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'D', 'E' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + /* The rows of the table must be ordered by the column values of + each row. For strings, the column value is the string id + in the string table. */ + + query = "SELECT * FROM `bar`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "B"), "Expected B, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "C"), "Expected E, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "D"), "Expected D, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "F"), "Expected F, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + DeleteFile(msifile); +} + static void test_select_markers(void) { MSIHANDLE hdb = 0, rec, view, res; @@ -8327,6 +8463,7 @@ START_TEST(db) test_update(); test_special_tables(); test_tables_order(); + test_rows_order(); test_select_markers(); test_viewmodify_update(); test_viewmodify_assign();

1 0

Hib Eris : msi: Fix merging string type checks.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 9dddb94b9990e3919f0b879934229de57e75f2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dddb94b9990e3919f0b87993… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 15:49:39 2009 +0200 msi: Fix merging string type checks. --- dlls/msi/database.c | 15 ++++++++++++++- dlls/msi/tests/db.c | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 85d71c2..adbdb9d 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1081,6 +1081,19 @@ typedef struct _tagMERGEDATA struct list *tabledata; } MERGEDATA; +static BOOL merge_type_match(LPCWSTR type1, LPCWSTR type2) +{ + if (((type1[0] == 'l') || (type1[0] == 's')) && + ((type2[0] == 'l') || (type2[0] == 's'))) + return TRUE; + + if (((type1[0] == 'L') || (type1[0] == 'S')) && + ((type2[0] == 'L') || (type2[0] == 'S'))) + return TRUE; + + return !lstrcmpW(type1, type2); +} + static UINT merge_verify_colnames(MSIQUERY *dbview, MSIQUERY *mergeview) { MSIRECORD *dbrec, *mergerec; @@ -1126,7 +1139,7 @@ static UINT merge_verify_colnames(MSIQUERY *dbview, MSIQUERY *mergeview) if (!MSI_RecordGetString(mergerec, i)) break; - if (lstrcmpW(MSI_RecordGetString(dbrec, i), + if (!merge_type_match(MSI_RecordGetString(dbrec, i), MSI_RecordGetString(mergerec, i))) { r = ERROR_DATATYPE_MISMATCH; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7013fa4..4bb0039 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -7273,7 +7273,7 @@ static void test_dbmerge(void) /* column sting types don't match exactly */ r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); - todo_wine ok(r == ERROR_SUCCESS, + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* nothing in MergeErrors */

1 0

Hib Eris : msi: Fix a failure with merging existing tables.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: a3214c978dc5689a4df359208444c6f446b745a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3214c978dc5689a4df359208… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 14:24:57 2009 +0200 msi: Fix a failure with merging existing tables. --- dlls/msi/database.c | 2 ++ dlls/msi/tests/db.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a75b8a8..85d71c2 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1335,6 +1335,8 @@ static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) } else if (r != ERROR_NO_MORE_ITEMS) goto done; + + r = ERROR_SUCCESS; } mergerow = msi_alloc(sizeof(MERGEROW)); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3551c9c..ea07ae6 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -7598,15 +7598,15 @@ static void test_dbmerge(void) MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 2, "Expected 2, got %d\n", r); + ok(r == 2, "Expected 2, got %d\n", r); size = MAX_PATH; r = MsiRecordGetStringA(hrec, 2, buf, &size); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf); MsiCloseHandle(hrec);

1 0

Hib Eris : msi/tests: Add test for merging string types.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 8d496332758de3ee2347b8a27c14bf007563897e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d496332758de3ee2347b8a27… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 14:25:53 2009 +0200 msi/tests: Add test for merging string types. --- dlls/msi/tests/db.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index ea07ae6..20043d6 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -7109,6 +7109,51 @@ static void test_dbmerge(void) r = run_query(href, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "CREATE TABLE `One` ( " + "`A` CHAR(72), " + "`B` CHAR(56), " + "`C` CHAR(64) LOCALIZABLE, " + "`D` LONGCHAR, " + "`E` CHAR(72) NOT NULL, " + "`F` CHAR(56) NOT NULL, " + "`G` CHAR(64) NOT NULL LOCALIZABLE, " + "`H` LONGCHAR NOT NULL " + "PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `One` ( " + "`A` CHAR(64), " + "`B` CHAR(64), " + "`C` CHAR(64), " + "`D` CHAR(64), " + "`E` CHAR(64) NOT NULL, " + "`F` CHAR(64) NOT NULL, " + "`G` CHAR(64) NOT NULL, " + "`H` CHAR(64) NOT NULL " + "PRIMARY KEY `A` )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* column sting types don't match exactly */ + r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); + todo_wine ok(r == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", r); + + /* nothing in MergeErrors */ + query = "SELECT * FROM `MergeErrors`"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "CREATE TABLE `One` ( `A` INT, `B` INT PRIMARY KEY `A` )"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Stefan Dösinger : wined3d: Use ARB constant limits in ARB.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 122ed40c2b47a48f708bd16007595b8bfe31df5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=122ed40c2b47a48f708bd1600… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 21:41:59 2009 +0200 wined3d: Use ARB constant limits in ARB. --- dlls/wined3d/arb_program_shader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c588c13..1141d4c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -84,10 +84,10 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) return stateblock->lowest_disabled_stage < 7; } -/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, +/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vs_arb_constantsF) - 1, * so upload them above that */ -#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vshader_constantsF) - 1) +#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vs_arb_constantsF) - 1) #define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 /* ARB_program_shader private data */ @@ -634,11 +634,11 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s * and don't know which are actually used. */ if(pshader) { - max_constantsF = GL_LIMITS(pshader_constantsF); + max_constantsF = GL_LIMITS(ps_arb_constantsF); } else { if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(iface, gl_info); + max_constantsF = GL_LIMITS(vs_arb_constantsF) - reserved_vs_const(iface, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -668,7 +668,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if(ctx->target_version >= NV2) *num_clipplanes = GL_LIMITS(clipplanes); else *num_clipplanes = min(GL_LIMITS(clipplanes), 4); - max_constantsF = GL_LIMITS(vshader_constantsF); + max_constantsF = GL_LIMITS(vs_arb_constantsF); } } @@ -4527,7 +4527,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); TRACE_(d3d_caps)("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); } - else if(GL_LIMITS(vshader_constantsF) >= 256) + else if(GL_LIMITS(vs_arb_constantsF) >= 256) { /* Shader Model 2.0 requires at least 256 vertex shader constants */ pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); @@ -4538,7 +4538,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); + pCaps->MaxVertexShaderConst = GL_LIMITS(vs_arb_constantsF); } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { @@ -4547,7 +4547,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } - else if(GL_LIMITS(pshader_constantsF) >= 32) + else if(GL_LIMITS(ps_arb_constantsF) >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); @@ -4559,7 +4559,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } pCaps->PixelShader1xMaxValue = 8.0f; - pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); + pCaps->MaxPixelShaderConst = GL_LIMITS(ps_arb_constantsF); } pCaps->VSClipping = use_nv_clip(gl_info);

1 0

Charles Davis : ntdll: Partially implement CDROM_GetControl() on Mac OS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: d22abc20a325bd54497319018a926e58db4792f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22abc20a325bd54497319018… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 19 12:15:11 2009 -0600 ntdll: Partially implement CDROM_GetControl() on Mac OS. Only the speed is returned. --- dlls/ntdll/cdrom.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 3e520ec..d9ab7e2 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -670,10 +670,20 @@ static NTSTATUS CDROM_GetStatusCode(int io) * CDROM_GetControl * */ -static NTSTATUS CDROM_GetControl(int dev, CDROM_AUDIO_CONTROL* cac) +static NTSTATUS CDROM_GetControl(int dev, int fd, CDROM_AUDIO_CONTROL* cac) { - cac->LbaFormat = 0; /* FIXME */ +#ifdef __APPLE__ + uint16_t speed; + int io = ioctl( fd, DKIOCCDGETSPEED, &speed ); + if (io != 0) return CDROM_GetStatusCode( io ); + /* DKIOCCDGETSPEED returns the speed in kilobytes per second, + * so convert to logical blocks (assumed to be ~2 KB). + */ + cac->LogicalBlocksPerSecond = speed/2; +#else cac->LogicalBlocksPerSecond = 1; /* FIXME */ +#endif + cac->LbaFormat = 0; /* FIXME */ return STATUS_NOT_SUPPORTED; } @@ -2762,7 +2772,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(CDROM_AUDIO_CONTROL); if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; - else status = CDROM_GetControl(dev, lpOutBuffer); + else status = CDROM_GetControl(dev, fd, lpOutBuffer); break; case IOCTL_CDROM_GET_DRIVE_GEOMETRY:

1 0

Charles Davis : ntdll: Implement CDROM_ScsiGetCaps() on Mac OS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 816a78b0cf9412793ff5d3ab8b8bbcd5e92f9ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=816a78b0cf9412793ff5d3ab8… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 19 12:15:18 2009 -0600 ntdll: Implement CDROM_ScsiGetCaps() on Mac OS. --- dlls/ntdll/cdrom.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index d9ab7e2..d3dd54b 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1892,12 +1892,12 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) * * */ -static NTSTATUS CDROM_ScsiGetCaps(PIO_SCSI_CAPABILITIES caps) +static NTSTATUS CDROM_ScsiGetCaps(int fd, PIO_SCSI_CAPABILITIES caps) { NTSTATUS ret = STATUS_NOT_IMPLEMENTED; - caps->Length = sizeof(*caps); #ifdef SG_SCATTER_SZ + caps->Length = sizeof(*caps); caps->MaximumTransferLength = SG_SCATTER_SZ; /* FIXME */ caps->MaximumPhysicalPages = SG_SCATTER_SZ / getpagesize(); caps->SupportedAsynchronousEvents = TRUE; @@ -1906,6 +1906,23 @@ static NTSTATUS CDROM_ScsiGetCaps(PIO_SCSI_CAPABILITIES caps) caps->AdapterScansDown = FALSE; /* FIXME ? */ caps->AdapterUsesPio = FALSE; /* FIXME ? */ ret = STATUS_SUCCESS; +#elif defined __APPLE__ + uint64_t bytesr, bytesw, align; + int io = ioctl(fd, DKIOCGETMAXBYTECOUNTREAD, &bytesr); + if (io != 0) return CDROM_GetStatusCode(io); + io = ioctl(fd, DKIOCGETMAXBYTECOUNTWRITE, &bytesw); + if (io != 0) return CDROM_GetStatusCode(io); + io = ioctl(fd, DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT, &align); + if (io != 0) return CDROM_GetStatusCode(io); + caps->Length = sizeof(*caps); + caps->MaximumTransferLength = bytesr < bytesw ? bytesr : bytesw; + caps->MaximumPhysicalPages = caps->MaximumTransferLength / getpagesize(); + caps->SupportedAsynchronousEvents = TRUE; + caps->AlignmentMask = align-1; + caps->TaggedQueuing = FALSE; /* we could check that it works and answer TRUE */ + caps->AdapterScansDown = FALSE; /* FIXME ? */ + caps->AdapterUsesPio = FALSE; /* FIXME ? */ + ret = STATUS_SUCCESS; #else FIXME("Unimplemented\n"); #endif @@ -2882,7 +2899,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(IO_SCSI_CAPABILITIES); if (lpOutBuffer == NULL) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sizeof(IO_SCSI_CAPABILITIES)) status = STATUS_BUFFER_TOO_SMALL; - else status = CDROM_ScsiGetCaps(lpOutBuffer); + else status = CDROM_ScsiGetCaps(fd, lpOutBuffer); break; case IOCTL_DVD_START_SESSION: sz = sizeof(DVD_SESSION_ID);

1 0