Author: akhaldi Date: Thu Mar 3 14:28:57 2016 New Revision: 70892
URL: http://svn.reactos.org/svn/reactos?rev=70892&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
Modified: trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/source.c
Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.c... ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -877,7 +877,7 @@ hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); HeapFree(GetProcessHeap(), 0, name); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); - if (!hr == S_OK) return hr; + if (hr != S_OK) return hr;
memset(&excepinfo, 0, sizeof(excepinfo)); hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_NEUTRAL, wFlags, pDispParams, pVarResult, &excepinfo, NULL);
Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=708... ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -1287,13 +1287,15 @@ r = run_query( hdb, 0, "CREATE TABLE `Properties` " "( `Property` CHAR(255), " - " `Value` CHAR(1), " - " `Intvalue` INT, " - " `Integervalue` INTEGER, " - " `Shortvalue` SHORT, " - " `Longvalue` LONG, " - " `Longcharvalue` LONGCHAR " - " PRIMARY KEY `Property`)" ); + " `Value` CHAR(1), " + " `Intvalue` INT, " + " `Integervalue` INTEGER, " + " `Shortvalue` SHORT, " + " `Longvalue` LONG, " + " `Longcharvalue` LONGCHAR, " + " `Charvalue` CHAR, " + " `Localizablevalue` CHAR LOCALIZABLE " + " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" );
/* check the column types */ @@ -1307,6 +1309,8 @@ ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n"); + ok( check_record( rec, 8, "S0"), "wrong record type\n"); + ok( check_record( rec, 9, "L0"), "wrong record type\n");
MsiCloseHandle( rec );
@@ -1318,6 +1322,8 @@ ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); + ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 8 ), "_columns table wrong\n"); + ok( 0x1f00 == get_columns_table_type(hdb, "Properties", 9 ), "_columns table wrong\n");
/* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1330,6 +1336,8 @@ ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); + ok( check_record( rec, 8, "Charvalue"), "wrong record type\n"); + ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n");
MsiCloseHandle( rec );
@@ -7266,7 +7274,7 @@ create_file_data("forcecodepage.idt", "\r\n\r\n9999\t_ForceCodepage\r\n", 0);
r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); - ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r);
MsiCloseHandle(hdb); DeleteFileA(msifile);
Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?re... ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -2994,7 +2994,7 @@ } else { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAIRE, got %u\n", r); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); todo_wine ok(!delete_pf("msitest\augustus", TRUE), "File installed\n"); ok(!delete_pf("msitest\caesar", TRUE), "File installed\n"); todo_wine ok(!delete_pf("msitest\maximus", TRUE), "File installed\n");
Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?rev... ============================================================================== --- trunk/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/source.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -986,7 +986,7 @@ r = pMsiSourceListAddSourceExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT | MSISOURCETYPE_URL, "C:\source", 0); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
lstrcpyA(keypath, "Software\Classes\Installer\Products\"); lstrcatA(keypath, prod_squashed); @@ -1315,7 +1315,7 @@ MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL, 0, value, &size); - ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value); ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
-
akhaldi＠svn.reactos.org